You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2019/01/02 20:10:49 UTC
[incubator-echarts] branch master updated (1cbe455 -> 78223af)
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.
from 1cbe455 Merge branch 'release'
add edd23af Fix z2 and cache on hover.
new 82bc19e Merge branch 'release'
new 78223af Sort of hoverStyle and highlight/downplay API
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/chart/custom.js | 4 ++-
src/component/helper/MapDraw.js | 7 ++--
src/util/graphic.js | 76 ++++++++++++++++++++++-------------------
test/hoverStyle.html | 56 ++++++++++++++++++++++++------
4 files changed, 91 insertions(+), 52 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 01/02: Merge branch 'release'
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 82bc19ed3390562bb2237df3eff80690dd737193
Merge: 1cbe455 edd23af
Author: sushuang <su...@gmail.com>
AuthorDate: Thu Jan 3 04:07:43 2019 +0800
Merge branch 'release'
src/util/graphic.js | 4 +---
test/hoverStyle.html | 36 +++++++++++++++++++++++++++++++++++-
2 files changed, 36 insertions(+), 4 deletions(-)
diff --cc src/util/graphic.js
index f821f9d,e490f76..80bf97a
--- a/src/util/graphic.js
+++ b/src/util/graphic.js
@@@ -355,13 -381,10 +354,12 @@@ function singleEnterNormal(el)
// when `el` is on emphasis state. So here by comparing with 1, we try
// hard to make the bug case rare.
var normalZ2 = el.__cachedNormalZ2;
- if (el.z2 - normalZ2 === Z2_LIFT_VALUE) {
+ if (normalZ2 != null && el.z2 - normalZ2 === Z2_LIFT_VALUE) {
el.z2 = normalZ2;
- el.__cachedNormalZ2 = null;
}
}
+
+ el.__extraOnNormal && el.__extraOnNormal();
}
function traverseCall(el, method) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 02/02: Sort of hoverStyle and
highlight/downplay API
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 78223af8144fc3653c71b3f2b1864a948ec95446
Author: sushuang <su...@gmail.com>
AuthorDate: Thu Jan 3 04:10:32 2019 +0800
Sort of hoverStyle and highlight/downplay API
---
src/chart/custom.js | 4 ++-
src/component/helper/MapDraw.js | 7 ++--
src/util/graphic.js | 72 ++++++++++++++++++++++-------------------
test/hoverStyle.html | 20 ++++++------
4 files changed, 55 insertions(+), 48 deletions(-)
diff --git a/src/chart/custom.js b/src/chart/custom.js
index 8a423ac..825d33b 100644
--- a/src/chart/custom.js
+++ b/src/chart/custom.js
@@ -327,7 +327,9 @@ function updateEl(el, dataIndex, elOption, animatableModel, data, isInit, isRoot
graphicUtil.setElementHoverStyle(el, styleEmphasis);
el.__cusHasEmphStl = !disableStyleEmphasis;
}
- isRoot && graphicUtil.setAsHighDownDispatcher(el, !disableStyleEmphasis);
+ if (isRoot) {
+ graphicUtil.setAsHighDownDispatcher(el, !disableStyleEmphasis);
+ }
}
function prepareStyleTransition(prop, targetStyle, elOptionStyle, oldElStyle, isInit) {
diff --git a/src/component/helper/MapDraw.js b/src/component/helper/MapDraw.js
index b7b8ee7..f57287f 100644
--- a/src/component/helper/MapDraw.js
+++ b/src/component/helper/MapDraw.js
@@ -332,11 +332,8 @@ MapDraw.prototype = {
var groupRegions = regionGroup.__regions || (regionGroup.__regions = []);
groupRegions.push(region);
- graphic.setHoverStyle(
- regionGroup,
- hoverItemStyle,
- {hoverSilentOnTouch: !!mapOrGeoModel.get('selectedMode')}
- );
+ regionGroup.highDownSilentOnTouch = !!mapOrGeoModel.get('selectedMode');
+ graphic.setHoverStyle(regionGroup, hoverItemStyle);
regionsGroup.add(regionGroup);
});
diff --git a/src/util/graphic.js b/src/util/graphic.js
index 80bf97a..14db581 100644
--- a/src/util/graphic.js
+++ b/src/util/graphic.js
@@ -377,13 +377,12 @@ function traverseCall(el, method) {
* to the `el`. See the reason on `setHoverStyle`.
*
* @param {module:zrender/Element} el Should not be `zrender/container/Group`.
+ * @param {Function} [el.highDownTransition] Called when transit.
* @param {Object|boolean} [hoverStl] The specified hover style.
* If set as `false`, disable the hover style.
* Similarly, The `el.hoverStyle` can alse be set
* as `false` to disable the hover style.
* Otherwise, use the default hover style if not provided.
- * @param {Object} [opt]
- * @param {boolean} [opt.hoverSilentOnTouch=false] See `graphic.setAsHighDownDispatcher`
*/
export function setElementHoverStyle(el, hoverStl) {
// For performance consideration, it might be better to make the "hover style" only the
@@ -446,30 +445,30 @@ export function removeExtraHighDownEffect(el) {
}
function onElementMouseOver(e) {
- if (this.__hoverSilentOnTouch && e.zrByTouch) {
- return;
- }
-
- // API highlight has higher priority than mouse highlight.
- !this.__doesEmphasisEnteredByAPI && traverseCall(this, singleEnterEmphasis);
+ !shouldSilent(this, e)
+ // API highlight has higher priority than mouse highlight.
+ && !this.__emphasisEnteredByAPI
+ && traverseCall(this, singleEnterEmphasis);
}
function onElementMouseOut(e) {
- if (this.__hoverSilentOnTouch && e.zrByTouch) {
- return;
- }
+ !shouldSilent(this, e)
+ // API highlight has higher priority than mouse highlight.
+ && !this.__emphasisEnteredByAPI
+ && traverseCall(this, singleEnterNormal);
+}
- // API highlight has higher priority than mouse highlight.
- !this.__doesEmphasisEnteredByAPI && traverseCall(this, singleEnterNormal);
+function shouldSilent(el, e) {
+ return el.__highDownSilentOnTouch && e.zrByTouch;
}
function onEnterEmphasisByAPI() {
- this.__doesEmphasisEnteredByAPI = true;
+ this.__emphasisEnteredByAPI = true;
traverseCall(this, singleEnterEmphasis);
}
function onEnterNormalByAPI() {
- this.__doesEmphasisEnteredByAPI = false;
+ this.__emphasisEnteredByAPI = false;
traverseCall(this, singleEnterNormal);
}
@@ -502,12 +501,16 @@ function onEnterNormalByAPI() {
* root group, we can simply mount the style on `el.hoverStyle` for them, but should
* not call this method for them.
*
+ * (3) These input parameters can be set directly on `el`:
+ *
* @param {module:zrender/Element} el
+ * @param {Object} [el.hoverStyle] Can be set on el or its descendants,
+ * e.g., `el.hoverStyle = ...; graphic.setHoverStyle(el); `.
+ * @param {boolean} [el.highDownSilentOnTouch=false] See `graphic.setAsHighDownDispatcher`.
+ * @param {Function} [el.highDownTransition] See `graphic.setElementHoverStyle`.
* @param {Object|boolean} [hoverStyle] See `graphic.setElementHoverStyle`.
- * @param {Object} [opt]
- * @param {boolean} [opt.hoverSilentOnTouch=false] See `graphic.setAsHighDownDispatcher`.
*/
-export function setHoverStyle(el, hoverStyle, opt) {
+export function setHoverStyle(el, hoverStyle) {
el.isGroup
? el.traverse(function (child) {
// If element has sepcified hoverStyle, then use it instead of given hoverStyle
@@ -516,25 +519,28 @@ export function setHoverStyle(el, hoverStyle, opt) {
})
: setElementHoverStyle(el, el.hoverStyle || hoverStyle);
- setAsHighDownDispatcher(el, opt);
+ setAsHighDownDispatcher(el, true);
}
/**
- * @param {Object|boolean} [opt] If `false`, means disable trigger.
- * @param {boolean} [opt.hoverSilentOnTouch=false]
- * In touch device, mouseover event will be trigger on touchstart event
- * (see module:zrender/dom/HandlerProxy). By this mechanism, we can
- * conveniently use hoverStyle when tap on touch screen without additional
- * code for compatibility.
- * But if the chart/component has select feature, which usually also use
- * hoverStyle, there might be conflict between 'select-highlight' and
- * 'hover-highlight' especially when roam is enabled (see geo for example).
- * In this case, hoverSilentOnTouch should be used to disable hover-highlight
- * on touch device.
+ * @param {module:zrender/Element} el
+ * @param {boolean} [el.highDownSilentOnTouch=false]
+ * In touch device, mouseover event will be trigger on touchstart event
+ * (see module:zrender/dom/HandlerProxy). By this mechanism, we can
+ * conveniently use hoverStyle when tap on touch screen without additional
+ * code for compatibility.
+ * But if the chart/component has select feature, which usually also use
+ * hoverStyle, there might be conflict between 'select-highlight' and
+ * 'hover-highlight' especially when roam is enabled (see geo for example).
+ * In this case, `highDownSilentOnTouch` should be used to disable
+ * hover-highlight on touch device.
+ * @param {boolean} [asDispatcher=true] If `false`, do not set as "highDownDispatcher".
*/
-export function setAsHighDownDispatcher(el, opt) {
- var disable = opt === false;
- el.__hoverSilentOnTouch = opt != null && opt.hoverSilentOnTouch;
+export function setAsHighDownDispatcher(el, asDispatcher) {
+ var disable = asDispatcher === false;
+ // Make `highDownSilentOnTouch` only work after `setAsHighDownDispatcher`
+ // called. Avoid it is modified by user unexpectedly.
+ el.__highDownSilentOnTouch = el.highDownSilentOnTouch;
// Simple optimize, since this method might be
// called for each elements of a group in some cases.
diff --git a/test/hoverStyle.html b/test/hoverStyle.html
index 64c3d5b..40a656c 100644
--- a/test/hoverStyle.html
+++ b/test/hoverStyle.html
@@ -120,14 +120,16 @@ under the License.
opt.buttons = buttons = genHoverLayerBtns().concat(buttons);
var chart = originalCreate.call(this, echarts, dom, opt);
- var zr = chart.getZr();
- var originalRefreshImmediately = zr.refreshImmediately;
- zr.refreshImmediately = function () {
- var result = originalRefreshImmediately.apply(this, arguments);
- // Make sure refreshImmediately is not called when `useHoverLayer`.
- genInfo(+new Date());
- return result;
- };
+ if (chart) {
+ var zr = chart.getZr();
+ var originalRefreshImmediately = zr.refreshImmediately;
+ zr.refreshImmediately = function () {
+ var result = originalRefreshImmediately.apply(this, arguments);
+ // Make sure refreshImmediately is not called when `useHoverLayer`.
+ genInfo(+new Date());
+ return result;
+ };
+ }
return chart;
}
@@ -223,7 +225,7 @@ under the License.
height: 200
});
- chart.on('click', function () {
+ chart && chart.on('click', function () {
chart.setOption({
color: ['blue']
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org