@visactor/vstory 0.0.5-alpha.4 → 0.0.6

package/dist/index.js

@@ -27895,146 +27895,6 @@
       return x <= x2 && x >= x1 && y <= y2 && y >= y1;
   }
 
-  const directlyAssignSpecKeys = ['seriesId', 'text'];
-  function isModelInfoMatchSpec(info, spec, specKey, index, option = {
-      ignoreIdMatch: false
-  }) {
-      if (!isNil$1(info.id)) {
-          const match = info.id === spec.id;
-          if (match || option.ignoreIdMatch !== true) {
-              return match;
-          }
-      }
-      return info.specKey === specKey && info.specIndex === index;
-  }
-  function baseMerge(target, source, shallowArray = false) {
-      if (source) {
-          if (target === source) {
-              return;
-          }
-          if (isValid$1(source) && typeof source === 'object') {
-              const iterable = Object(source);
-              const props = [];
-              for (const key in iterable) {
-                  props.push(key);
-              }
-              let { length } = props;
-              let propIndex = -1;
-              while (length--) {
-                  const key = props[++propIndex];
-                  if (isValid$1(iterable[key]) && typeof iterable[key] === 'object') {
-                      baseMergeDeep(target, source, key, shallowArray);
-                  }
-                  else {
-                      assignMergeValue(target, key, iterable[key]);
-                  }
-              }
-          }
-      }
-  }
-  function baseMergeDeep(target, source, key, shallowArray = false) {
-      const objValue = target[key];
-      const srcValue = source[key];
-      let newValue = source[key];
-      let isCommon = true;
-      if (directlyAssignSpecKeys.includes(key)) {
-          isCommon = false;
-      }
-      else if (isArray$1(srcValue)) {
-          if (shallowArray || !objValue) {
-              newValue = [];
-          }
-          else if (isArray$1(objValue)) {
-              newValue = objValue;
-          }
-          else if (isArrayLike$1(objValue) && !isString$1(objValue)) {
-              newValue = new Array(objValue.length);
-              let index = -1;
-              const length = objValue.length;
-              while (++index < length) {
-                  newValue[index] = objValue[index];
-              }
-          }
-      }
-      else if (isPlainObject$1(srcValue)) {
-          newValue = objValue !== null && objValue !== void 0 ? objValue : {};
-          if (typeof objValue === 'function' || typeof objValue !== 'object') {
-              newValue = {};
-          }
-      }
-      else {
-          isCommon = false;
-      }
-      if (isCommon) {
-          baseMerge(newValue, srcValue, shallowArray);
-      }
-      assignMergeValue(target, key, newValue);
-  }
-  function assignMergeValue(target, key, value) {
-      if ((value !== undefined && !eq(target[key], value)) || (value === undefined && !(key in target))) {
-          target[key] = value;
-      }
-  }
-  function eq(value, other) {
-      return value === other || (Number.isNaN(value) && Number.isNaN(other));
-  }
-  function mergeSpec$1(target, ...sources) {
-      let sourceIndex = -1;
-      const length = sources.length;
-      while (++sourceIndex < length) {
-          const source = sources[sourceIndex];
-          baseMerge(target, source, false);
-      }
-      return target;
-  }
-  function findChartSpec(s, vchartSpec) {
-      const chartSpec = vchartSpec[s.specKey];
-      if (!chartSpec) {
-          return null;
-      }
-      if (isArray$1(chartSpec)) {
-          return chartSpec.find((_s, index) => {
-              return isModelInfoMatchSpec(s, _s, s.specKey, index);
-          });
-      }
-      else if (isObject$1(chartSpec)) {
-          return isModelInfoMatchSpec(s, chartSpec, s.specKey, 0) ? chartSpec : null;
-      }
-      return null;
-  }
-  function mergeChartOption(target, ...sources) {
-      const performanceHook = {};
-      function pushHookToTemp(hooks) {
-          Object.keys(hooks).forEach((k) => {
-              if (!performanceHook[k]) {
-                  performanceHook[k] = [];
-              }
-              performanceHook[k].push(hooks[k]);
-          });
-      }
-      if (target.performanceHook) {
-          pushHookToTemp(target.performanceHook);
-      }
-      sources.forEach(source => {
-          if (!source) {
-              return;
-          }
-          const { performanceHook } = source, rest = __rest$4(source, ["performanceHook"]);
-          if (performanceHook) {
-              pushHookToTemp(performanceHook);
-          }
-          merge(target, rest);
-      });
-      target.performanceHook = {};
-      Object.keys(performanceHook).forEach(k => {
-          target.performanceHook[k] = (...args) => {
-              performanceHook[k].forEach(f => f(...args));
-          };
-      });
-      return target;
-  }
-
-  const VIEW_BOX_EXPEND = 4;
   const CHART_NUMBER_TYPE = genNumberType();
   class Chart extends Group {
       get vchart() {
@@ -28069,19 +27929,7 @@
           this._boundsChangeTag = true;
           this.numberType = CHART_NUMBER_TYPE;
           if (!params.vchart) {
-              params.vchart = this._vchart = new params.ClassType(params.spec, mergeChartOption({
-                  renderCanvas: params.renderCanvas,
-                  mode: params.mode,
-                  modeParams: params.modeParams,
-                  canvasControled: false,
-                  dpr: params.dpr,
-                  interactive: params.interactive,
-                  animation: false,
-                  autoFit: false,
-                  disableTriggerEvent: params.disableTriggerEvent,
-                  disableDirtyBounds: params.disableDirtyBounds,
-                  ticker: params.ticker,
-                  beforeRender: () => {
+              params.vchart = this._vchart = new params.ClassType(params.spec, Object.assign({ renderCanvas: params.renderCanvas, mode: params.mode, modeParams: params.modeParams, canvasControled: false, dpr: params.dpr, interactive: params.interactive, animation: false, autoFit: false, disableTriggerEvent: params.disableTriggerEvent, disableDirtyBounds: params.disableDirtyBounds, ticker: params.ticker, beforeRender: () => {
                       var _a;
                       if (!this.stage) {
                           return;
@@ -28092,8 +27940,7 @@
                           (_a = this.stage.dirtyBounds) === null || _a === void 0 ? void 0 : _a.union(this.globalAABBBounds);
                           this.stage.renderNextFrame();
                       }
-                  },
-                  afterRender: () => {
+                  }, afterRender: () => {
                       if (!this._vchart) {
                           return;
                       }
@@ -28102,8 +27949,7 @@
                       }
                       this._vchart.getStage()._editor_needRender = false;
                       this._vchart.getStage().stage.resumeRender();
-                  }
-              }, (_a = params.chartInitOptions) !== null && _a !== void 0 ? _a : {}));
+                  } }, ((_a = params.chartInitOptions) !== null && _a !== void 0 ? _a : {})));
           }
           else {
               this._vchart = params.vchart;
@@ -28149,11 +27995,8 @@
               return;
           }
           this._boundsChangeTag = true;
-          this._vchart.resize(this._globalViewBox.x2 - this._globalViewBox.x1, this._globalViewBox.y2 - this._globalViewBox.y1);
           const rootBounds = this._getVChartRootMarkBounds();
-          this._vchart
-              .getStage()
-              .defaultLayer.translateTo(-rootBounds.x1 + VIEW_BOX_EXPEND, -rootBounds.y1 + VIEW_BOX_EXPEND);
+          this._vchart.getStage().defaultLayer.translateTo(-rootBounds.x1, -rootBounds.y1);
           this._BoundsViewBox = rootBounds;
           const viewBox = Object.assign({}, this._globalViewBox);
           this.setAttributes({
@@ -28170,14 +28013,13 @@
           viewBox.y2 -= viewBox.y1;
           viewBox.x1 = 0;
           viewBox.y1 = 0;
+          this._vchart.resize(viewBox.x2 - viewBox.x1, viewBox.y2 - viewBox.y1);
           this._vchart.updateViewBox(viewBox);
           const renderViewBox = Object.assign({}, rootBounds);
           renderViewBox.x2 -= renderViewBox.x1;
           renderViewBox.y2 -= renderViewBox.y1;
           renderViewBox.x1 = 0;
           renderViewBox.y1 = 0;
-          renderViewBox.x2 += VIEW_BOX_EXPEND * 2;
-          renderViewBox.y2 += VIEW_BOX_EXPEND * 2;
           this._vchart._compiler._view.renderer.setViewBox(renderViewBox, true);
       }
       release() {
@@ -33190,7 +33032,7 @@
     if (!isNil$3(path)) return get$1(target, path, defaultValue);
   };
 
-  function mergeSpec(target) {
+  function mergeSpec$1(target) {
     var sourceIndex = -1;
     var length = arguments.length <= 1 ? 0 : arguments.length - 1;
     for (; ++sourceIndex < length;) {
@@ -33201,12 +33043,12 @@
   }
   function mergeSpecWithFilter(target, filter, spec, forceMerge) {
     Object.keys(target).forEach(function (k) {
-      if (isObject$3(filter)) filter.type === k && (isArray$3(target[k]) ? target[k].length >= filter.index && (target[k][filter.index] = forceMerge ? mergeSpec({}, target[k][filter.index], spec) : spec) : target[k] = forceMerge ? mergeSpec({}, target[k], spec) : spec);else if (isArray$3(target[k])) {
+      if (isObject$3(filter)) filter.type === k && (isArray$3(target[k]) ? target[k].length >= filter.index && (target[k][filter.index] = forceMerge ? mergeSpec$1({}, target[k][filter.index], spec) : spec) : target[k] = forceMerge ? mergeSpec$1({}, target[k], spec) : spec);else if (isArray$3(target[k])) {
         var index = target[k].findIndex(function (_s) {
           return _s.id === filter;
         });
-        index >= 0 && (target[k][index] = forceMerge ? mergeSpec({}, target[k][index], spec) : spec);
-      } else target.id === filter && (target[k] = forceMerge ? mergeSpec({}, target[k], spec) : spec);
+        index >= 0 && (target[k][index] = forceMerge ? mergeSpec$1({}, target[k][index], spec) : spec);
+      } else target.id === filter && (target[k] = forceMerge ? mergeSpec$1({}, target[k], spec) : spec);
     });
   }
 
@@ -33409,7 +33251,7 @@
     for (var _len = arguments.length, sources = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
       sources[_key - 1] = arguments[_key];
     }
-    return mergeSpec.apply(void 0, [transformThemeToMerge(target)].concat(_toConsumableArray(sources.map(transformThemeToMerge))));
+    return mergeSpec$1.apply(void 0, [transformThemeToMerge(target)].concat(_toConsumableArray(sources.map(transformThemeToMerge))));
   }
   function transformThemeToMerge(theme) {
     var _a;
@@ -41273,7 +41115,7 @@
         if (this._shouldMergeThemeToSpec()) {
           var specFromChart = this._getDefaultSpecFromChart(chartSpec),
             merge = function merge(originalSpec) {
-              return mergeSpec({}, theme, specFromChart, originalSpec);
+              return mergeSpec$1({}, theme, specFromChart, originalSpec);
             };
           return isArray$3(spec) ? {
             spec: spec.map(function (specItem) {
@@ -43752,7 +43594,7 @@
           referer: void 0
         });
         var attrLevel = null === (_a = stateStyle[state][attr]) || void 0 === _a ? void 0 : _a.level;
-        isValid$3(attrLevel) && attrLevel <= level && mergeSpec(stateStyle[state][attr], {
+        isValid$3(attrLevel) && attrLevel <= level && mergeSpec$1(stateStyle[state][attr], {
           style: style,
           level: level
         }), "normal" !== state && attr in this._extensionChannel && this._extensionChannel[attr].forEach(function (key) {
@@ -44204,7 +44046,7 @@
     function VChart(spec, options) {
       var _this = this;
       _classCallCheck(this, VChart);
-      var _a, _b, _c, _d, _e, _f, _g, _h;
+      var _a, _b, _c, _d, _e, _f;
       this.id = createID(), this._userEvents = [], this._autoSize = !0, this._option = {
         mode: RenderModeEnum["desktop-browser"],
         onError: function onError(msg) {
@@ -44243,13 +44085,13 @@
       }, this._option = merge$1(this._option, {
         animation: !1 !== spec.animation
       }, options), this._onError = null === (_a = this._option) || void 0 === _a ? void 0 : _a.onError;
-      var _j = this._option,
-        dom = _j.dom,
-        renderCanvas = _j.renderCanvas,
-        mode = _j.mode,
-        stage = _j.stage,
-        poptip = _j.poptip,
-        restOptions = __rest$1(_j, ["dom", "renderCanvas", "mode", "stage", "poptip"]),
+      var _g = this._option,
+        dom = _g.dom,
+        renderCanvas = _g.renderCanvas,
+        mode = _g.mode,
+        stage = _g.stage,
+        poptip = _g.poptip,
+        restOptions = __rest$1(_g, ["dom", "renderCanvas", "mode", "stage", "poptip"]),
         isTrueBrowseEnv = isTrueBrowser(mode);
       isTrueBrowseEnv ? registerBrowserEnv() : "node" === mode && registerNodeEnv(), isTrueBrowseEnv && dom && (this._container = isString$3(dom) ? vglobal.getElementById(dom) : dom), renderCanvas && (this._canvas = renderCanvas), stage && (this._stage = stage), "node" === mode || this._container || this._canvas || this._stage ? (this._viewBox = this._option.viewBox, this._currentThemeName = ThemeManager$1.getCurrentThemeName(), this._setNewSpec(spec), this._updateCurrentTheme(), this._currentSize = this.getCurrentSize(), this._compiler = new Compiler({
         dom: null !== (_c = this._container) && void 0 !== _c ? _c : "none",
@@ -44261,7 +44103,7 @@
       }, restOptions), {
         background: this._getBackground(),
         onError: this._onError
-      })), this._compiler.setSize(this._currentSize.width, this._currentSize.height), this._eventDispatcher = new EventDispatcher(this, this._compiler), this._event = new Event$1(this._eventDispatcher, mode), this._compiler.initView(), this._setFontFamilyTheme(null === (_d = this._currentTheme) || void 0 === _d ? void 0 : _d.fontFamily), this._initDataSet(this._option.dataSet), this._autoSize = !!isTrueBrowseEnv && (null === (_f = null !== (_e = spec.autoFit) && void 0 !== _e ? _e : this._option.autoFit) || void 0 === _f || _f), this._bindResizeEvent(), this._bindVGrammarViewEvent(), this._initChartPlugin(), InstanceManager.registerInstance(this), null === (_h = null === (_g = this._option.performanceHook) || void 0 === _g ? void 0 : _g.afterCreateVChart) || void 0 === _h || _h.call(_g, this)) : null === (_b = this._option) || void 0 === _b || _b.onError("please specify container or renderCanvas!");
+      })), this._compiler.setSize(this._currentSize.width, this._currentSize.height), this._eventDispatcher = new EventDispatcher(this, this._compiler), this._event = new Event$1(this._eventDispatcher, mode), this._compiler.initView(), this._setFontFamilyTheme(null === (_d = this._currentTheme) || void 0 === _d ? void 0 : _d.fontFamily), this._initDataSet(this._option.dataSet), this._autoSize = !!isTrueBrowseEnv && (null === (_f = null !== (_e = spec.autoFit) && void 0 !== _e ? _e : this._option.autoFit) || void 0 === _f || _f), this._bindResizeEvent(), this._bindVGrammarViewEvent(), this._initChartPlugin(), InstanceManager.registerInstance(this)) : null === (_b = this._option) || void 0 === _b || _b.onError("please specify container or renderCanvas!");
     }
     return _createClass(VChart, [{
       key: "getSpec",
@@ -44281,7 +44123,7 @@
     }, {
       key: "_setNewSpec",
       value: function _setNewSpec(spec, forceMerge) {
-        return !!spec && (isString$3(spec) && (spec = JSON.parse(spec)), forceMerge && this._originalSpec && (spec = mergeSpec({}, this._originalSpec, spec)), this._originalSpec = spec, this._spec = this._getSpecFromOriginalSpec(), !0);
+        return !!spec && (isString$3(spec) && (spec = JSON.parse(spec)), forceMerge && this._originalSpec && (spec = mergeSpec$1({}, this._originalSpec, spec)), this._originalSpec = spec, this._spec = this._getSpecFromOriginalSpec(), !0);
       }
     }, {
       key: "_getSpecFromOriginalSpec",
@@ -44426,7 +44268,7 @@
         if (this._chart) return !0;
         var transformSpec = option.transformSpec,
           actionSource = option.actionSource;
-        return transformSpec && this._initChartSpec(this._spec, "render"), this._chartPluginApply("onBeforeInitChart", this._spec, actionSource), null === (_b = null === (_a = this._option.performanceHook) || void 0 === _a ? void 0 : _a.beforeInitializeChart) || void 0 === _b || _b.call(_a, this), this._initChart(this._spec), null === (_d = null === (_c = this._option.performanceHook) || void 0 === _c ? void 0 : _c.afterInitializeChart) || void 0 === _d || _d.call(_c, this), !(!this._chart || !this._compiler) && (null === (_f = null === (_e = this._option.performanceHook) || void 0 === _e ? void 0 : _e.beforeCompileToVGrammar) || void 0 === _f || _f.call(_e), this._compiler.compile({
+        return transformSpec && this._initChartSpec(this._spec, "render"), this._chartPluginApply("onBeforeInitChart", this._spec, actionSource), null === (_b = null === (_a = this._option.performanceHook) || void 0 === _a ? void 0 : _a.beforeInitializeChart) || void 0 === _b || _b.call(_a), this._initChart(this._spec), null === (_d = null === (_c = this._option.performanceHook) || void 0 === _c ? void 0 : _c.afterInitializeChart) || void 0 === _d || _d.call(_c), !(!this._chart || !this._compiler) && (null === (_f = null === (_e = this._option.performanceHook) || void 0 === _e ? void 0 : _e.beforeCompileToVGrammar) || void 0 === _f || _f.call(_e), this._compiler.compile({
           chart: this._chart,
           vChart: this
         }, {
@@ -44721,7 +44563,7 @@
         var sync = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : !1;
         var forceMerge = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : !1;
         var morphConfig = arguments.length > 4 ? arguments[4] : undefined;
-        forceMerge && (spec = mergeSpec({}, model.getSpec(), spec));
+        forceMerge && (spec = mergeSpec$1({}, model.getSpec(), spec));
         var result = model.updateSpec(spec);
         return model.reInit(spec), (result.change || result.reCompile || result.reMake || result.reSize || result.reRender) && this._chart.reDataFlow(), this.updateCustomConfigAndRerender(result, sync, {
           morphConfig: morphConfig,
@@ -47350,7 +47192,7 @@
       _initGraphics() {
           var _a, _b;
           const { spec, viewBox } = this._getChartOption();
-          this._graphic = new Chart(Object.assign(Object.assign({ renderCanvas: this._option.canvas.getCanvas(), spec, ClassType: VChart, vchart: null, zIndex: this._spec.zIndex, mode: 'desktop-browser', dpr: window.devicePixelRatio, interactive: false, autoRender: false, disableDirtyBounds: true, viewBox, ticker: this._option.canvas.getStage().ticker, visibleAll: false }, ((_a = this._spec.options.panel) !== null && _a !== void 0 ? _a : {})), { chartInitOptions: mergeChartOption({
+          this._graphic = new Chart(Object.assign(Object.assign({ renderCanvas: this._option.canvas.getCanvas(), spec, ClassType: VChart, vchart: null, zIndex: this._spec.zIndex, mode: 'desktop-browser', dpr: window.devicePixelRatio, interactive: false, autoRender: false, disableDirtyBounds: true, viewBox, ticker: this._option.canvas.getStage().ticker, visibleAll: false }, ((_a = this._spec.options.panel) !== null && _a !== void 0 ? _a : {})), { chartInitOptions: merge({
                   animation: true,
                   disableTriggerEvent: true,
                   performanceHook: {
@@ -50508,9 +50350,6 @@
       get player() {
           return this._player;
       }
-      get characterTree() {
-          return this._characterTree;
-      }
       constructor(spec, option) {
           this.id = 'test-mvp_' + Story._id_++;
           this._canvas = new StoryCanvas(this, isString$1(option.dom) ? document.getElementById(option.dom) : option.dom);
@@ -50838,6 +50677,114 @@
   }
   Edit.componentConstructorMap = {};
 
+  const directlyAssignSpecKeys = ['seriesId', 'text'];
+  function isModelInfoMatchSpec(info, spec, specKey, index, option = {
+      ignoreIdMatch: false
+  }) {
+      if (!isNil$1(info.id)) {
+          const match = info.id === spec.id;
+          if (match || option.ignoreIdMatch !== true) {
+              return match;
+          }
+      }
+      return info.specKey === specKey && info.specIndex === index;
+  }
+  function baseMerge(target, source, shallowArray = false) {
+      if (source) {
+          if (target === source) {
+              return;
+          }
+          if (isValid$1(source) && typeof source === 'object') {
+              const iterable = Object(source);
+              const props = [];
+              for (const key in iterable) {
+                  props.push(key);
+              }
+              let { length } = props;
+              let propIndex = -1;
+              while (length--) {
+                  const key = props[++propIndex];
+                  if (isValid$1(iterable[key]) && typeof iterable[key] === 'object') {
+                      baseMergeDeep(target, source, key, shallowArray);
+                  }
+                  else {
+                      assignMergeValue(target, key, iterable[key]);
+                  }
+              }
+          }
+      }
+  }
+  function baseMergeDeep(target, source, key, shallowArray = false) {
+      const objValue = target[key];
+      const srcValue = source[key];
+      let newValue = source[key];
+      let isCommon = true;
+      if (directlyAssignSpecKeys.includes(key)) {
+          isCommon = false;
+      }
+      else if (isArray$1(srcValue)) {
+          if (shallowArray || !objValue) {
+              newValue = [];
+          }
+          else if (isArray$1(objValue)) {
+              newValue = objValue;
+          }
+          else if (isArrayLike$1(objValue) && !isString$1(objValue)) {
+              newValue = new Array(objValue.length);
+              let index = -1;
+              const length = objValue.length;
+              while (++index < length) {
+                  newValue[index] = objValue[index];
+              }
+          }
+      }
+      else if (isPlainObject$1(srcValue)) {
+          newValue = objValue !== null && objValue !== void 0 ? objValue : {};
+          if (typeof objValue === 'function' || typeof objValue !== 'object') {
+              newValue = {};
+          }
+      }
+      else {
+          isCommon = false;
+      }
+      if (isCommon) {
+          baseMerge(newValue, srcValue, shallowArray);
+      }
+      assignMergeValue(target, key, newValue);
+  }
+  function assignMergeValue(target, key, value) {
+      if ((value !== undefined && !eq(target[key], value)) || (value === undefined && !(key in target))) {
+          target[key] = value;
+      }
+  }
+  function eq(value, other) {
+      return value === other || (Number.isNaN(value) && Number.isNaN(other));
+  }
+  function mergeSpec(target, ...sources) {
+      let sourceIndex = -1;
+      const length = sources.length;
+      while (++sourceIndex < length) {
+          const source = sources[sourceIndex];
+          baseMerge(target, source, false);
+      }
+      return target;
+  }
+  function findChartSpec(s, vchartSpec) {
+      const chartSpec = vchartSpec[s.specKey];
+      if (!chartSpec) {
+          return null;
+      }
+      if (isArray$1(chartSpec)) {
+          return chartSpec.find((_s, index) => {
+              return isModelInfoMatchSpec(s, _s, s.specKey, index);
+          });
+      }
+      else if (isObject$1(chartSpec)) {
+          return isModelInfoMatchSpec(s, chartSpec, s.specKey, 0) ? chartSpec : null;
+      }
+      return null;
+  }
+
   registerCharacter();
 
   exports.Edit = Edit;
@@ -50854,8 +50801,7 @@
   exports.isModelInfoMatchSpec = isModelInfoMatchSpec;
   exports.labelMarkPick = labelMarkPick;
   exports.markerMarkPick = markerMarkPick;
-  exports.mergeChartOption = mergeChartOption;
-  exports.mergeSpec = mergeSpec$1;
+  exports.mergeSpec = mergeSpec;
   exports.registerCharacter = registerCharacter;
   exports.scrollBarMarkPick = scrollBarMarkPick;
   exports.seriesMarkPick = seriesMarkPick;