leafer-ui 2.2.4 → 2.2.6

package/dist/web.module.js

@@ -1904,7 +1904,7 @@ function getNameList(name) {
 
 const D$5 = Debug;
 
-const debug$g = Debug.get("RunTime");
+const debug$h = Debug.get("RunTime");
 
 const Run = {
     currentId: 0,
@@ -1923,7 +1923,7 @@ const Run = {
         const time = R$1.idMap[id], name = R$1.nameMap[id];
         const duration = microsecond ? (performance.now() - time) / 1e3 : Date.now() - time;
         R$1.idMap[id] = R$1.nameMap[id] = R$1.nameToIdMap[name] = undefined;
-        debug$g.log(name, duration, "ms");
+        debug$h.log(name, duration, "ms");
     },
     endOfName(name, microsecond) {
         const id = R$1.nameToIdMap[name];
@@ -1959,18 +1959,18 @@ const Creator = {
     }
 };
 
-const debug$f = Debug.get("UICreator");
+const debug$g = Debug.get("UICreator");
 
 const UICreator = {
     list: {},
     register(UI) {
         const {__tag: tag} = UI.prototype;
-        if (list$1[tag]) debug$f.repeat(tag);
+        if (list$1[tag]) debug$g.repeat(tag);
         list$1[tag] = UI;
     },
     get(tag, data, x, y, width, height) {
         if (!list$1[tag]) {
-            debug$f.warn("not register " + tag);
+            debug$g.warn("not register " + tag);
             return undefined;
         }
         const ui = new list$1[tag](data);
@@ -1986,7 +1986,7 @@ const UICreator = {
 
 const {list: list$1} = UICreator;
 
-const debug$e = Debug.get("EventCreator");
+const debug$f = Debug.get("EventCreator");
 
 const EventCreator = {
     nameList: {},
@@ -1994,7 +1994,7 @@ const EventCreator = {
         let name;
         Object.keys(Event).forEach(key => {
             name = Event[key];
-            if (isString(name)) nameList[name] && debug$e.repeat(name), nameList[name] = Event;
+            if (isString(name)) nameList[name] && debug$f.repeat(name), nameList[name] = Event;
         });
     },
     changeName(oldName, newName) {
@@ -3003,7 +3003,7 @@ const {rect: rect$3, roundRect: roundRect$2, arcTo: arcTo$3, arc: arc$3, ellipse
 
 const {ellipticalArc: ellipticalArc} = EllipseHelper;
 
-const debug$d = Debug.get("PathConvert");
+const debug$e = Debug.get("PathConvert");
 
 const setEndPoint$1 = {};
 
@@ -3270,7 +3270,7 @@ const PathConvert = {
                 break;
 
               default:
-                debug$d.error(`command: ${command} [index:${i}]`, old);
+                debug$e.error(`command: ${command} [index:${i}]`, old);
                 return data;
             }
             lastCommand = command;
@@ -3333,7 +3333,10 @@ const {tan: tan, min: min$1, abs: abs$4} = Math;
 
 const startPoint = {};
 
+const debug$d = Debug.get("PointsCurve");
+
 const PathCommandDataHelper = {
+    pointsCurveList: {},
     beginPath(data) {
         data.length = 0;
     },
@@ -3403,12 +3406,22 @@ const PathCommandDataHelper = {
         data.push(M$3, startPoint.x, startPoint.y);
         arc$2(data, x, y, radius, startAngle, endAngle, anticlockwise);
     },
-    drawPoints(data, points, curve, close) {
-        BezierHelper.points(data, points, curve, close);
+    drawPoints(data, points, curve, close, options) {
+        let type = "Q";
+        if (isObject(curve)) type = curve.type, curve = curve.value;
+        if (!pointsCurveList[type]) debug$d.warn("not found:", type), type = "Q";
+        pointsCurveList[type](data, points, curve, close, options);
     }
 };
 
-const {ellipse: ellipse$3, arc: arc$2} = PathCommandDataHelper;
+const {ellipse: ellipse$3, arc: arc$2, pointsCurveList: pointsCurveList} = PathCommandDataHelper;
+
+function registerPointsCurve(type, fn) {
+    if (pointsCurveList[type]) debug$d.repeat(type);
+    pointsCurveList[type] = fn;
+}
+
+registerPointsCurve("Q", BezierHelper.points);
 
 const {moveTo: moveTo$4, lineTo: lineTo$3, quadraticCurveTo: quadraticCurveTo, bezierCurveTo: bezierCurveTo, closePath: closePath$3, beginPath: beginPath, rect: rect$2, roundRect: roundRect$1, ellipse: ellipse$2, arc: arc$1, arcTo: arcTo$2, drawEllipse: drawEllipse, drawArc: drawArc, drawPoints: drawPoints$2} = PathCommandDataHelper;
 
@@ -4773,7 +4786,7 @@ function useModule(module, exclude) {
             if (!excludeNames.includes(name) && (!exclude || !exclude.includes(name))) {
                 if (module.prototype) {
                     const d = getDescriptor(module.prototype, name);
-                    if (d.writable) target.prototype[name] = module.prototype[name];
+                    if (d) Object.defineProperty(target.prototype, name, d);
                 } else {
                     target.prototype[name] = module[name];
                 }
@@ -7023,7 +7036,7 @@ class LeafLevelList {
     }
 }
 
-const version = "2.2.4";
+const version = "2.2.6";
 
 const debug$5 = Debug.get("LeaferCanvas");
 
@@ -8030,7 +8043,7 @@ class Picker {
         if (child.__hitWorld(point, onlyHitMask && child.mask === "path" ? true : undefined)) {
             const {parent: parent, mask: mask} = child;
             if (parent && parent.__hasMask && mask && !(mask === "clipping" || mask === "clipping-path")) {
-                if (!parent.children.some(item => !item.mask && item.__hitWorld(point))) return;
+                if (!parent.children.some(item => !item.mask && this.isHitLeaf(item, point))) return;
             }
             const leaf = proxy || child, {hitThrough: hitThrough} = child, {findList: findList} = this;
             if (hitThrough) {
@@ -8040,6 +8053,15 @@ class Picker {
             findList.add(leaf);
         }
     }
+    isHitLeaf(leaf, point) {
+        if (leaf.isBranch) {
+            const {findList: findList} = this, old = findList.length;
+            this.eachFind([ leaf ], false);
+            const count = findList.length - old;
+            for (let i = 0; i < count; i++) findList.remove(findList.indexAt(findList.length - 1));
+            return !!count;
+        } else return leaf.__hitWorld(point);
+    }
     clear() {
         this.point = null;
         this.findList = null;
@@ -8558,7 +8580,7 @@ const UIRender = {
         }
         if (data.__useEffect) {
             const {shadow: shadow, fill: fill, stroke: stroke} = data, otherEffect = data.innerShadow || data.blur || data.backgroundBlur || data.filter;
-            stintSet$2(data, "__isFastShadow", shadow && !otherEffect && shadow.length < 2 && !shadow[0].spread && !Effect.isTransformShadow(shadow[0]) && fill && !data.__isTransparentFill && !(isArray(fill) && fill.length > 1) && (this.useFastShadow || !stroke || stroke && data.strokeAlign === "inside"));
+            stintSet$2(data, "__isFastShadow", shadow && !otherEffect && shadow.length < 2 && !shadow[0].spread && !Effect.isTransformShadow(shadow[0]) && !(shadow[0].blendMode && shadow[0].blendMode !== "pass-through") && fill && !data.__isTransparentFill && !(isArray(fill) && fill.length > 1) && (this.useFastShadow || !stroke || stroke && data.strokeAlign === "inside"));
             data.__useEffect = !!(shadow || otherEffect);
         }
         data.__checkSingle();
@@ -9616,7 +9638,7 @@ let Polygon = class Polygon extends UI {
         const data = this.__;
         const path = data.path = [];
         if (data.points) {
-            drawPoints$1(path, data.points, data.curve, data.closed);
+            drawPoints$1(path, data.points, data.curve, data.closed, data);
         } else {
             const {width: width, height: height, sides: sides, startAngle: startAngle} = data;
             const rx = width / 2, ry = height / 2;
@@ -9708,7 +9730,7 @@ let Line = class Line extends UI {
         const data = this.__;
         const path = data.path = [];
         if (data.points) {
-            drawPoints(path, data.points, data.curve, data.closed);
+            drawPoints(path, data.points, data.curve, data.closed, data);
         } else {
             moveTo(path, 0, 0);
             lineTo(path, this.width, 0);
@@ -13599,4 +13621,4 @@ Object.assign(Creator, {
 
 useCanvas();
 
-export { AlignHelper, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragBoundsHelper, DragEvent$1 as DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, FourNumberHelper, Frame, FrameData, Group, GroupData, HitCanvasManager, Image$1 as Image, ImageData, ImageEvent, ImageManager, IncrementId, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferFilm, LeaferImage, LeaferVideo, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MyDragEvent, MyImage, MyPointerEvent, MyTouchEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNodeHandleType, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent$1 as PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Resource, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TouchEvent, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, UnitConvertHelper, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createAttr, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, doSurfaceType, effectType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, strokeType, surfaceType, tempBounds$2 as tempBounds, tempMatrix$2 as tempMatrix, tempPoint$4 as tempPoint, tryToNumber, useCanvas, useModule, version, visibleType, zoomLayerType };
+export { AlignHelper, Answer, App, AroundHelper, AutoBounds, BezierHelper, Bounds, BoundsEvent, BoundsHelper, Box, BoxData, Branch, BranchHelper, BranchRender, Canvas, CanvasData, CanvasManager, ChildEvent, ColorConvert, Creator, Cursor, DataHelper, Debug, Direction4, Direction9, DragBoundsHelper, DragEvent$1 as DragEvent, Dragger, DropEvent, Effect, Ellipse, EllipseData, EllipseHelper, Event, EventCreator, Eventer, Export, FileHelper, Filter, FourNumberHelper, Frame, FrameData, Group, GroupData, HitCanvasManager, Image$1 as Image, ImageData, ImageEvent, ImageManager, IncrementId, Interaction, InteractionBase, InteractionHelper, KeyEvent, Keyboard, LayoutEvent, Layouter, Leaf, LeafBounds, LeafBoundsHelper, LeafData, LeafDataProxy, LeafEventer, LeafHelper, LeafLayout, LeafLevelList, LeafList, LeafMatrix, LeafRender, Leafer, LeaferCanvas, LeaferCanvasBase, LeaferData, LeaferEvent, LeaferFilm, LeaferImage, LeaferVideo, Line, LineData, MathHelper, Matrix, MatrixHelper, MoveEvent, MyDragEvent, MyImage, MyPointerEvent, MyTouchEvent, NeedConvertToCanvasCommandMap, OneRadian, PI2, PI_2, Paint, PaintGradient, PaintImage, Path, PathArrow, PathBounds, PathCommandDataHelper, PathCommandMap, PathCommandNodeHelper, PathConvert, PathCorner, PathCreator, PathData, PathDrawer, PathHelper, PathNodeHandleType, PathNumberCommandLengthMap, PathNumberCommandMap, Pen, PenData, Picker, Platform, Plugin, Point, PointHelper, PointerButton, PointerEvent$1 as PointerEvent, Polygon, PolygonData, PropertyEvent, Rect, RectData, RectHelper, RectRender, RenderEvent, Renderer, ResizeEvent, Resource, RotateEvent, Run, Selector, Star, StarData, State, StringNumberMap, SwipeEvent, TaskItem, TaskProcessor, Text, TextConvert, TextData, TouchEvent, Transition, TwoPointBoundsHelper, UI, UIBounds, UICreator, UIData, UIEvent, UIRender, UnitConvert, UnitConvertHelper, WaitHelper, WatchEvent, Watcher, ZoomEvent, affectRenderBoundsType, affectStrokeBoundsType, attr, autoLayoutType, boundsType, canvasPatch, canvasSizeAttrs, createAttr, createDescriptor, cursorType, dataProcessor, dataType, decorateLeafAttr, defineDataProcessor, defineKey, defineLeafAttr, dimType, doBoundsType, doStrokeType, doSurfaceType, effectType, emptyData, eraserType, extraPropertyEventMap, getBoundsData, getDescriptor, getMatrixData, getPointData, hitType, isArray, isData, isEmptyData, isFinite, isNull, isNumber, isObject, isString, isUndefined, layoutProcessor, leaferTransformAttrMap, maskType, naturalBoundsType, opacityType, path, pathInputType, pathType, pen, positionType, registerPointsCurve, registerUI, registerUIEvent, resizeType, rewrite, rewriteAble, rotationType, scaleType, scrollType, sortType, strokeType, surfaceType, tempBounds$2 as tempBounds, tempMatrix$2 as tempMatrix, tempPoint$4 as tempPoint, tryToNumber, useCanvas, useModule, version, visibleType, zoomLayerType };