npm - @nativescript/canvas - Versions diffs - 1.0.0 → 1.1.0-alpha.1 - Mend

@nativescript/canvas 1.0.0 → 1.1.0-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (126) hide show

package/Canvas/common.d.ts CHANGED Viewed

@@ -66,4 +66,5 @@ export declare abstract class CanvasBase extends View implements ICanvasBase {
     _touchEvent(event: any): void;
     _createTouchEvent(name: any, extraData: any): any;
     _createPointerEvent(name: any, extraData: any): any;
+    preventDefault(): void;
 }

package/Canvas/common.js CHANGED Viewed

@@ -12,7 +12,7 @@ export class TouchEvent {
     constructor(name, init) {
         this.type = name;
         if (init && typeof init === 'object') {
-            Object.keys(init).forEach(key => {
+            Object.keys(init).forEach((key) => {
                 this[key] = init[key];
             });
         }
@@ -24,7 +24,7 @@ export class PointerEvent {
     constructor(name, init) {
         this.type = name;
         if (init && typeof init === 'object') {
-            Object.keys(init).forEach(key => {
+            Object.keys(init).forEach((key) => {
                 this[key] = init[key];
             });
         }
@@ -32,11 +32,11 @@ export class PointerEvent {
     preventDefault() { }
     stopPropagation() { }
 }
-const WEB_GESTURE_EVENTS = ['touchmove', 'touchstart', 'touchcancel', 'touchend', 'change', 'pointerup', 'pointerdown', 'pointermove', 'pointercancel'];
+const WEB_GESTURE_EVENTS = ['touchmove', 'touchstart', 'touchcancel', 'touchend', 'change', 'pointerup', 'pointerdown', 'pointermove', 'pointercancel', 'mousedown', 'mousemove'];
 export const ignorePixelScalingProperty = new Property({
     name: 'ignorePixelScaling',
     defaultValue: false,
-    valueConverter: booleanConverter
+    valueConverter: booleanConverter,
 });
 let pointerId = 0;
 let CanvasBase = class CanvasBase extends View {
@@ -62,7 +62,7 @@ let CanvasBase = class CanvasBase extends View {
         super.removeEventListener(arg, callback, thisArg);
         if (WEB_GESTURE_EVENTS.indexOf(arg) !== -1) {
             // if we dont have any other web gestures we can unregister gestures
-            if (!WEB_GESTURE_EVENTS.some(e => this.hasListeners(e))) {
+            if (!WEB_GESTURE_EVENTS.some((e) => this.hasListeners(e))) {
                 this.__unregisterGestures();
             }
         }
@@ -165,7 +165,10 @@ let CanvasBase = class CanvasBase extends View {
             value = PercentLength.parse(value);
         }
         if (typeof value === 'number') {
-            // treat as px
+            // treat as dip
+            if (global.isIOS) {
+                return Utils.layout.toDevicePixels(value) || 0;
+            }
             return value || 0;
         }
         else if ((value !== null || true) && typeof value === 'object' && typeof value.value && typeof value.unit) {
@@ -257,10 +260,13 @@ let CanvasBase = class CanvasBase extends View {
         let extraData;
         let hasPointerDown = false;
         let hasTouchStart = false;
+        let hasMouseDown = false;
         let hasPointerMove = false;
         let hasTouchMove = false;
+        let hasMouseMove = false;
         let hasPointerUp = false;
         let hasTouchEnd = false;
+        let hasMouseUp = false;
         let hasPointerCancel = false;
         let hasTouchCancel = false;
         if (event.eventName === 'touch') {
@@ -268,7 +274,8 @@ let CanvasBase = class CanvasBase extends View {
                 case 'down':
                     hasPointerDown = this.hasListeners('pointerdown');
                     hasTouchStart = this.hasListeners('touchstart');
-                    if (hasPointerDown || hasTouchStart) {
+                    hasMouseDown = this.hasListeners('mousedown');
+                    if (hasPointerDown || hasTouchStart || hasMouseDown) {
                         const numberOfPointers = event.getPointerCount();
                         const positions = this._positionsFromEvent(event);
                         const x = event.getX();
@@ -277,20 +284,25 @@ let CanvasBase = class CanvasBase extends View {
                             numberOfPointers,
                             positions,
                             x,
-                            y
+                            y,
                         };
                     }
-                    if (hasPointerDown && this._previousPointerCount !== extraData.numberOfPointers) {
+                    if ((hasPointerDown || hasMouseDown) && this._previousPointerCount !== extraData.numberOfPointers) {
                         this._previousPointerCount = extraData.numberOfPointers;
                         pointerId++;
                         this._pointers[this._previousPointerCount - 1] = {
                             id: pointerId,
                             coords: {
                                 x: extraData.x,
-                                y: extraData.y
-                            }
+                                y: extraData.y,
+                            },
                         };
-                        this.notify(Object.assign(Object.assign({}, this._createPointerEvent('pointerdown', extraData)), { pointerId: pointerId }));
+                        if (hasPointerDown) {
+                            this.notify(Object.assign(Object.assign({}, this._createPointerEvent('pointerdown', extraData)), { pointerId: pointerId }));
+                        }
+                        if (hasMouseDown) {
+                            this.notify(Object.assign(Object.assign({}, this._createPointerEvent('mousedown', extraData)), { pointerId: pointerId }));
+                        }
                     }
                     if (hasTouchStart) {
                         this.notify(this._createTouchEvent('touchstart', extraData));
@@ -299,7 +311,8 @@ let CanvasBase = class CanvasBase extends View {
                 case 'up':
                     hasPointerUp = this.hasListeners('pointerup');
                     hasTouchEnd = this.hasListeners('touchend');
-                    if (hasPointerUp || hasTouchEnd) {
+                    hasMouseUp = this.hasListeners('mouseup');
+                    if (hasPointerUp || hasTouchEnd || hasMouseUp) {
                         const numberOfPointers = event.getPointerCount();
                         const positions = this._positionsFromEvent(event);
                         const x = event.getX();
@@ -308,15 +321,20 @@ let CanvasBase = class CanvasBase extends View {
                             numberOfPointers,
                             positions,
                             x,
-                            y
+                            y,
                         };
                     }
-                    if (hasPointerUp) {
+                    if (hasPointerUp || hasMouseUp) {
                         this._previousPointerCount -= extraData.numberOfPointers;
                         for (let i = 0; i < extraData.numberOfPointers; i++) {
                             const x = extraData.positions[i];
                             const y = extraData.positions[i + 1];
-                            this.notify(Object.assign(Object.assign({}, this._createPointerEvent('pointerup', Object.assign(Object.assign({}, extraData), { x, y }))), { pointerId: this._pointers[i].id }));
+                            if (hasPointerUp) {
+                                this.notify(Object.assign(Object.assign({}, this._createPointerEvent('pointerup', Object.assign(Object.assign({}, extraData), { x, y }))), { pointerId: this._pointers[i].id }));
+                            }
+                            if (hasMouseUp) {
+                                this.notify(Object.assign(Object.assign({}, this._createPointerEvent('mouseup', Object.assign(Object.assign({}, extraData), { x, y }))), { pointerId: this._pointers[i].id }));
+                            }
                         }
                     }
                     if (hasTouchEnd) {
@@ -335,7 +353,7 @@ let CanvasBase = class CanvasBase extends View {
                             numberOfPointers,
                             positions,
                             x,
-                            y
+                            y,
                         };
                     }
                     if (hasPointerCancel) {
@@ -360,14 +378,15 @@ let CanvasBase = class CanvasBase extends View {
                         const numberOfPointers = this._pointerCountFromEvent(event);
                         hasPointerMove = this.hasListeners('pointermove');
                         hasTouchMove = this.hasListeners('touchmove');
+                        hasMouseMove = this.hasListeners('mousemove');
                         let data = {};
-                        if (hasPointerMove || hasTouchMove) {
+                        if (hasPointerMove || hasTouchMove || hasMouseMove) {
                             const positions = this._positionsFromEvent(event);
                             extraData = {
                                 numberOfPointers,
                                 positions,
                                 x: positions[0],
-                                y: positions[1]
+                                y: positions[1],
                             };
                             const dx = extraData.positions[2] - extraData.positions[0];
                             const dy = extraData.positions[3] - extraData.positions[1];
@@ -391,13 +410,18 @@ let CanvasBase = class CanvasBase extends View {
                                 deltaZ: 0,
                             };
                         }
-                        if (hasPointerMove) {
+                        if (hasPointerMove || hasMouseMove) {
                             const count = extraData.numberOfPointers;
                             const positions = extraData.positions;
                             for (let i = 0; i < count; i++) {
                                 let x = positions[i] - extraData.x;
                                 let y = positions[i + 1] - extraData.y;
-                                this.notify(Object.assign(Object.assign({}, this._createPointerEvent('pointermove', Object.assign(Object.assign({}, extraData), { x, y }))), { pointerId: this._pointers[i].id }));
+                                if (hasPointerMove) {
+                                    this.notify(Object.assign(Object.assign({}, this._createPointerEvent('pointermove', Object.assign(Object.assign({}, extraData), { x, y }))), { pointerId: this._pointers[i].id }));
+                                }
+                                if (hasMouseMove) {
+                                    this.notify(Object.assign(Object.assign({}, this._createPointerEvent('mousemove', Object.assign(Object.assign({}, extraData), { x, y }))), { pointerId: this._pointers[i].id }));
+                                }
                             }
                         }
                         if (hasTouchMove) {
@@ -411,7 +435,7 @@ let CanvasBase = class CanvasBase extends View {
         }
         else if (event.eventName === 'pinch') {
             if (global.isAndroid) {
-                if ((event.state === GestureStateTypes.began || event.state === GestureStateTypes.changed)) {
+                if (event.state === GestureStateTypes.began || event.state === GestureStateTypes.changed) {
                     this._isPinching = true;
                     this._previousPinchDistance = 0;
                 }
@@ -432,15 +456,16 @@ let CanvasBase = class CanvasBase extends View {
                     if (global.isIOS) {
                         hasPointerMove = this.hasListeners('pointermove');
                         hasTouchMove = this.hasListeners('touchmove');
+                        hasMouseMove = this.hasListeners('mousemove');
                         let data = {};
                         let delta = 0;
-                        if (hasPointerMove || hasTouchMove) {
+                        if (hasPointerMove || hasTouchMove || hasMouseMove) {
                             const positions = this._positionsFromEvent(event);
                             extraData = {
                                 numberOfPointers,
                                 positions,
                                 x: positions[0],
-                                y: positions[1]
+                                y: positions[1],
                             };
                             const dx = extraData.positions[2] - extraData.positions[0];
                             const dy = extraData.positions[3] - extraData.positions[1];
@@ -463,13 +488,18 @@ let CanvasBase = class CanvasBase extends View {
                                 deltaZ: 0,
                             };
                         }
-                        if (hasPointerMove) {
+                        if (hasPointerMove || hasMouseMove) {
                             const count = extraData.numberOfPointers;
                             const positions = extraData.positions;
                             for (let i = 0; i < count; i++) {
                                 let x = positions[i] - extraData.x;
                                 let y = positions[i + 1] - extraData.y;
-                                this.notify(Object.assign(Object.assign({}, this._createPointerEvent('pointermove', Object.assign(Object.assign({}, extraData), { x, y }))), { pointerId: this._pointers[i].id }));
+                                if (hasPointerMove) {
+                                    this.notify(Object.assign(Object.assign({}, this._createPointerEvent('pointermove', Object.assign(Object.assign({}, extraData), { x, y }))), { pointerId: this._pointers[i].id }));
+                                }
+                                if (hasMouseMove) {
+                                    this.notify(Object.assign(Object.assign({}, this._createPointerEvent('mousemove', Object.assign(Object.assign({}, extraData), { x, y }))), { pointerId: this._pointers[i].id }));
+                                }
                             }
                         }
                         if (hasTouchMove) {
@@ -486,7 +516,8 @@ let CanvasBase = class CanvasBase extends View {
             if (event.state === GestureStateTypes.began || event.state === GestureStateTypes.changed) {
                 hasPointerMove = this.hasListeners('pointermove');
                 hasTouchMove = this.hasListeners('touchmove');
-                if (hasPointerMove || hasTouchMove) {
+                hasMouseMove = this.hasListeners('mousemove');
+                if (hasPointerMove || hasTouchMove || hasMouseMove) {
                     const numberOfPointers = this._pointerCountFromEvent(event);
                     const positions = this._positionsFromEvent(event);
                     const x = positions[0];
@@ -495,15 +526,20 @@ let CanvasBase = class CanvasBase extends View {
                         numberOfPointers,
                         positions,
                         x,
-                        y
+                        y,
                     };
                 }
-                if (hasPointerMove) {
+                if (hasPointerMove || hasMouseMove) {
                     const positions = extraData.positions;
                     for (let i = 0; i < extraData.numberOfPointers; i++) {
                         const x = positions[i];
                         const y = positions[i + 1];
-                        this.notify(Object.assign(Object.assign({}, this._createPointerEvent('pointermove', { numberOfPointers: extraData.numberOfPointers, positions, x, y })), { pointerId: this._pointers[i].id }));
+                        if (hasPointerMove) {
+                            this.notify(Object.assign(Object.assign({}, this._createPointerEvent('pointermove', { numberOfPointers: extraData.numberOfPointers, positions, x, y })), { pointerId: this._pointers[i].id }));
+                        }
+                        if (hasMouseMove) {
+                            this.notify(Object.assign(Object.assign({}, this._createPointerEvent('mousemove', { numberOfPointers: extraData.numberOfPointers, positions, x, y })), { pointerId: this._pointers[i].id }));
+                        }
                     }
                 }
                 if (hasTouchMove) {
@@ -575,10 +611,11 @@ let CanvasBase = class CanvasBase extends View {
             y,
             width: 23.4375,
             height: 23.4375,
-            isPrimary: true
+            isPrimary: true,
         };
-        return Object.assign(new PointerEvent(name), Object.assign({ eventName: name, defaultPrevented: false, cancelable: false, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false, target: this }, activePointer));
+        return Object.assign(new PointerEvent(name), Object.assign(Object.assign({ eventName: name, defaultPrevented: false, cancelable: false, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false, target: this }, activePointer), { preventDefault: () => { } }));
     }
+    preventDefault() { }
 };
 CanvasBase.readyEvent = 'ready';
 CanvasBase = __decorate([

package/Canvas/common.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../packages/canvas/Canvas/common.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../packages/canvas/Canvas/common.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAQ7I,MAAM,OAAO,UAAU;IAEtB,YAAY,IAAI,EAAE,IAA6B;QAC9C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACjC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC;SACH;IACF,CAAC;IACD,cAAc,KAAI,CAAC;IACnB,eAAe,KAAI,CAAC;CACpB;AAED,MAAM,OAAO,YAAY;IAExB,YAAY,IAAI,EAAE,IAA6B;QAC9C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACjC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC;SACH;IACF,CAAC;IACD,cAAc,KAAI,CAAC;IACnB,eAAe,KAAI,CAAC;CACpB;AAED,MAAM,kBAAkB,GAAG,CAAC,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,eAAe,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;AAElL,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,QAAQ,CAAsB;IAC3E,IAAI,EAAE,oBAAoB;IAC1B,YAAY,EAAE,KAAK;IACnB,cAAc,EAAE,gBAAgB;CAChC,CAAC,CAAC;AAEH,IAAI,SAAS,GAAG,CAAC,CAAC;AAElB,IAAsB,UAAU,GAAhC,MAAsB,UAAW,SAAQ,IAAI;IAkB5C;QACC,KAAK,EAAE,CAAC;QAhBT,cAAS,GAAY,KAAK,CAAC;QAInB,wBAAmB,GAAG,KAAK,CAAC;QAE5B,gBAAW,GAAG,KAAK,CAAC;QAEpB,eAAU,GAAG,CAAC,CAAC;QACf,eAAU,GAAG,CAAC,CAAC;QACf,2BAAsB,GAAG,CAAC,CAAC;QAC3B,0BAAqB,GAAG,CAAC,CAAC;QAE1B,cAAS,GAAuD,EAAE,CAAC;QAI1E,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,EAAE,CAAC;IAC7B,CAAC;IAEM,gBAAgB,CAAC,GAAW,EAAE,QAAa,EAAE,OAAa;QAChE,KAAK,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC/C,IAAI,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;YAC3C,IAAI,CAAC,gBAAgB,EAAE,CAAC;SACxB;IACF,CAAC;IAEM,mBAAmB,CAAC,GAAW,EAAE,QAAa,EAAE,OAAa;QACnE,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;YAC3C,oEAAoE;YACpE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE;gBAC1D,IAAI,CAAC,oBAAoB,EAAE,CAAC;aAC5B;SACD;IACF,CAAC;IAED,IAAI,SAAS;QACZ,OAAO,IAAI,CAAC,UAAU,CAAC;IACxB,CAAC;IAED,IAAI,SAAS;QACZ,OAAO;YACN,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,EAAE,OAAO,CAAC;YACvE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,EAAE,QAAQ,CAAC;SAC3E,CAAC;IACH,CAAC;IAED,qBAAqB,CAAC,IAAI,EAAE,WAAY;QACvC,MAAM,gBAAgB,GAAG;YACxB,KAAK,EAAE,IAAI;YACX,SAAS,EAAE,IAAI;YACf,KAAK,EAAE,IAAI;YACX,4BAA4B,EAAE,KAAK;YACnC,eAAe,EAAE,SAAS;YAC1B,kBAAkB,EAAE,IAAI;YACxB,qBAAqB,EAAE,KAAK;YAC5B,OAAO,EAAE,KAAK;YACd,cAAc,EAAE,KAAK;YACrB,YAAY,EAAE,KAAK;SACnB,CAAC;QACF,IAAI,CAAC,WAAW,EAAE;YACjB,IAAI,IAAI,KAAK,IAAI,EAAE;gBAClB,OAAO;oBACN,KAAK,EAAE,IAAI;iBACX,CAAC;aACF;YACD,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE;gBAC/B,OAAO,gBAAgB,CAAC;aACxB;SACD;QACD,IAAI,IAAI,KAAK,IAAI,EAAE;YAClB,IAAI,WAAW,CAAC,KAAK,KAAK,SAAS,IAAI,OAAO,WAAW,CAAC,KAAK,KAAK,SAAS,EAAE;gBAC9E,OAAO,WAAW,CAAC;aACnB;iBAAM;gBACN,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;aACvB;SACD;QACD,MAAM,YAAY,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YACpC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;YACxC,IAAI,QAAQ,KAAK,SAAS,IAAI,OAAO,KAAK,KAAK,OAAO,QAAQ,EAAE;gBAC/D,gBAAgB,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;aAC/B;QACF,CAAC,CAAC;QACF,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE;YAC/B,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;YACzC,YAAY,CAAC,WAAW,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;YACjD,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;YACzC,YAAY,CAAC,8BAA8B,EAAE,WAAW,CAAC,4BAA4B,CAAC,CAAC;YACvF,YAAY,CAAC,iBAAiB,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;YAC7D,YAAY,CAAC,oBAAoB,EAAE,WAAW,CAAC,kBAAkB,CAAC,CAAC;YACnE,YAAY,CAAC,uBAAuB,EAAE,WAAW,CAAC,qBAAqB,CAAC,CAAC;YACzE,YAAY,CAAC,SAAS,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;YAC7C,YAAY,CAAC,gBAAgB,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;YAC3D,OAAO,gBAAgB,CAAC;SACxB;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,WAAW;QACV,IAAI,CAAC,MAAM,CAAC;YACX,SAAS,EAAE,OAAO;YAClB,MAAM,EAAE,IAAI;SACZ,CAAC,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,MAAM;QAClB,IAAI,MAAM,KAAK,OAAO,EAAE;YACvB,OAAO,IAAI,CAAC,KAAK,CAAC;SAClB;QACD,IAAI,MAAM,KAAK,QAAQ,EAAE;YACxB,OAAO,IAAI,CAAC,MAAM,CAAC;SACnB;QAED,IAAI,MAAM,KAAK,UAAU,EAAE;YAC1B,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;SACzC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC;IACrB,CAAC;IAED,YAAY,CAAC,MAAM;QAClB,IAAI,MAAM,KAAK,OAAO,EAAE;YACvB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;gBACnC,IAAI,CAAC,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;aACpC;SACD;QACD,IAAI,MAAM,KAAK,QAAQ,EAAE;YACxB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;gBACnC,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;aACrC;SACD;QACD,IAAI,MAAM,KAAK,UAAU,EAAE;YAC1B,IAAI,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;SAChC;IACF,CAAC;IAeO,OAAO,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI;QACxC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC9B,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACnC;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC9B,eAAe;YACf,IAAI,MAAM,CAAC,KAAK,EAAE;gBACjB,OAAO,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC/C;YACD,OAAO,KAAK,IAAI,CAAC,CAAC;SAClB;aAAM,IAAI,CAAC,KAAK,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,KAAK,IAAI,OAAO,KAAK,CAAC,IAAI,EAAE;YAC5G,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE;gBACxB,OAAO,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC;aACxB;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE;gBAChC,OAAO,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aACrD;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,EAAE;gBAC9B,IAAI,WAAW,CAAC,WAAW,EAAE,KAAK,UAAU,EAAE;oBAC7C,OAAO,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,GAAG,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC;iBAC5G;qBAAM,IAAI,WAAW,CAAC,WAAW,EAAE,KAAK,WAAW,EAAE;oBACrD,OAAO,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,GAAG,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC;iBAC5G;qBAAM;oBACN,OAAO,CAAC,CAAC;iBACT;aACD;iBAAM;gBACN,OAAO,CAAC,CAAC;aACT;SACD;aAAM;YACN,OAAO,CAAC,CAAC;SACT;IACF,CAAC;IAED,iBAAiB,KAAI,CAAC;IAEtB,qBAAqB,KAAI,CAAC;IAE1B,gBAAgB;QACf,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE;YAC9B,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;YAChC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SAC9F;IACF,CAAC;IAED,oBAAoB;QACnB,IAAI,IAAI,CAAC,mBAAmB,EAAE;YAC7B,IAAI,CAAC,mBAAmB,GAAG,KAAK,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,mBAAmB,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SACxF;IACF,CAAC;IAED,sBAAsB,CAAC,KAAK;;QAC3B,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,MAAM,CAAC,KAAK,EAAE;YACjB,KAAK,GAAG,MAAA,KAAK,CAAC,GAAG,CAAC,eAAe,mCAAI,CAAC,CAAC;SACvC;aAAM,IAAI,MAAM,CAAC,SAAS,EAAE;YAC5B,KAAK,GAAG,MAAA,MAAA,MAAA,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,EAAC,eAAe,kDAAI,mCAAI,CAAC,CAAC;SACnG;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,mBAAmB,CAAC,KAAK;;QACxB,MAAM,SAAS,GAAG,EAAE,CAAC;QAErB,IAAI,MAAM,CAAC,KAAK,EAAE;YACjB,MAAM,GAAG,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG,0CAAE,OAAyB,CAAC;YAClD,IAAI,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG,0CAAE,OAAO,aAAY,KAAK,EAAE;gBACzC,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,CAAC;gBAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;oBACnC,MAAM,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;oBACvC,MAAM,KAAK,GAAG,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC/C,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;iBACjC;aACD;iBAAM;gBACN,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC;gBACxC,MAAM,GAAG,GAAwB,KAAK,CAAC,GAAG,CAAC;gBAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;oBAC/B,MAAM,KAAK,GAAG,GAAG,CAAC,qBAAqB,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;oBACrD,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;iBACjC;aACD;SACD;aAAM,IAAI,MAAM,CAAC,SAAS,EAAE;YAC5B,MAAM,WAAW,GAAG,MAAA,MAAA,KAAK,CAAC,OAAO,0CAAE,OAAO,mCAAI,KAAK,CAAC,OAAO,CAAC;YAC5D,MAAM,KAAK,GAAG,WAAW,CAAC,eAAe,EAAE,CAAC;YAC5C,MAAM,MAAM,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC;YAE5D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;gBAC/B,WAAW,CAAC,gBAAgB,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;gBACxC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBACvF,MAAM,CAAC,KAAK,EAAE,CAAC;aACf;SACD;QAED,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,WAAW,CAAC,KAAU;QACrB,IAAI,SAAS,CAAC;QAEd,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,IAAI,aAAa,GAAG,KAAK,CAAC;QAC1B,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,IAAI,YAAY,GAAG,KAAK,CAAC;QAEzB,IAAI,YAAY,GAAG,KAAK,CAAC;QACzB,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,IAAI,UAAU,GAAG,KAAK,CAAC;QAEvB,IAAI,gBAAgB,GAAG,KAAK,CAAC;QAC7B,IAAI,cAAc,GAAG,KAAK,CAAC;QAE3B,IAAI,KAAK,CAAC,SAAS,KAAK,OAAO,EAAE;YAChC,QAAQ,KAAK,CAAC,MAAM,EAAE;gBACrB,KAAK,MAAM;oBACV,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;oBAClD,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;oBAChD,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;oBAC9C,IAAI,cAAc,IAAI,aAAa,IAAI,YAAY,EAAE;wBACpD,MAAM,gBAAgB,GAA2B,KAAM,CAAC,eAAe,EAAE,CAAC;wBAC1E,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;wBAClD,MAAM,CAAC,GAA2B,KAAM,CAAC,IAAI,EAAE,CAAC;wBAChD,MAAM,CAAC,GAA2B,KAAM,CAAC,IAAI,EAAE,CAAC;wBAChD,SAAS,GAAG;4BACX,gBAAgB;4BAChB,SAAS;4BACT,CAAC;4BACD,CAAC;yBACD,CAAC;qBACF;oBAED,IAAI,CAAC,cAAc,IAAI,YAAY,CAAC,IAAI,IAAI,CAAC,qBAAqB,KAAK,SAAS,CAAC,gBAAgB,EAAE;wBAClG,IAAI,CAAC,qBAAqB,GAAG,SAAS,CAAC,gBAAgB,CAAC;wBACxD,SAAS,EAAE,CAAC;wBAEZ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,GAAG,CAAC,CAAC,GAAG;4BAChD,EAAE,EAAE,SAAS;4BACb,MAAM,EAAE;gCACP,CAAC,EAAE,SAAS,CAAC,CAAC;gCACd,CAAC,EAAE,SAAS,CAAC,CAAC;6BACd;yBACD,CAAC;wBAEF,IAAI,cAAc,EAAE;4BACnB,IAAI,CAAC,MAAM,iCACP,IAAI,CAAC,mBAAmB,CAAC,aAAa,EAAE,SAAS,CAAC,KACrD,SAAS,EAAE,SAAS,IACnB,CAAC;yBACH;wBAED,IAAI,YAAY,EAAE;4BACjB,IAAI,CAAC,MAAM,iCACP,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,SAAS,CAAC,KACnD,SAAS,EAAE,SAAS,IACnB,CAAC;yBACH;qBACD;oBAED,IAAI,aAAa,EAAE;wBAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC;qBAC7D;oBAED,MAAM;gBACP,KAAK,IAAI;oBACR,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;oBAC9C,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;oBAC5C,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBAE1C,IAAI,YAAY,IAAI,WAAW,IAAI,UAAU,EAAE;wBAC9C,MAAM,gBAAgB,GAA2B,KAAM,CAAC,eAAe,EAAE,CAAC;wBAC1E,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;wBAClD,MAAM,CAAC,GAA2B,KAAM,CAAC,IAAI,EAAE,CAAC;wBAChD,MAAM,CAAC,GAA2B,KAAM,CAAC,IAAI,EAAE,CAAC;wBAChD,SAAS,GAAG;4BACX,gBAAgB;4BAChB,SAAS;4BACT,CAAC;4BACD,CAAC;yBACD,CAAC;qBACF;oBAED,IAAI,YAAY,IAAI,UAAU,EAAE;wBAC/B,IAAI,CAAC,qBAAqB,IAAI,SAAS,CAAC,gBAAgB,CAAC;wBACzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,gBAAgB,EAAE,CAAC,EAAE,EAAE;4BACpD,MAAM,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;4BACjC,MAAM,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;4BAErC,IAAI,YAAY,EAAE;gCACjB,IAAI,CAAC,MAAM,iCACP,IAAI,CAAC,mBAAmB,CAAC,WAAW,kCAAO,SAAS,KAAE,CAAC,EAAE,CAAC,IAAG,KAChE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAC9B,CAAC;6BACH;4BAED,IAAI,UAAU,EAAE;gCACf,IAAI,CAAC,MAAM,iCACP,IAAI,CAAC,mBAAmB,CAAC,SAAS,kCAAO,SAAS,KAAE,CAAC,EAAE,CAAC,IAAG,KAC9D,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAC9B,CAAC;6BACH;yBACD;qBACD;oBAED,IAAI,WAAW,EAAE;wBAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;qBAC3D;oBACD,MAAM;gBACP,KAAK,QAAQ;oBACZ,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;oBACtD,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;oBAClD,IAAI,gBAAgB,IAAI,cAAc,EAAE;wBACvC,MAAM,gBAAgB,GAA2B,KAAM,CAAC,eAAe,EAAE,CAAC;wBAC1E,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;wBAClD,MAAM,CAAC,GAA2B,KAAM,CAAC,IAAI,EAAE,CAAC;wBAChD,MAAM,CAAC,GAA2B,KAAM,CAAC,IAAI,EAAE,CAAC;wBAChD,SAAS,GAAG;4BACX,gBAAgB;4BAChB,SAAS;4BACT,CAAC;4BACD,CAAC;yBACD,CAAC;qBACF;oBACD,IAAI,gBAAgB,EAAE;wBACrB,IAAI,MAAM,CAAC,SAAS,EAAE;4BACrB,IAAI,CAAC,qBAAqB,IAAI,SAAS,CAAC,gBAAgB,CAAC;yBACzD;6BAAM,IAAI,MAAM,CAAC,KAAK,EAAE;4BACxB,IAAI,CAAC,qBAAqB,IAAI,CAAC,CAAC;yBAChC;wBACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,gBAAgB,EAAE,CAAC,EAAE,EAAE;4BACpD,MAAM,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;4BACjC,MAAM,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;4BACrC,IAAI,CAAC,MAAM,iCACP,IAAI,CAAC,mBAAmB,CAAC,eAAe,kCAAO,SAAS,KAAE,CAAC,EAAE,CAAC,IAAG,KACpE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAC9B,CAAC;yBACH;qBACD;oBAED,IAAI,cAAc,EAAE;wBACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC;qBAC9D;oBACD,MAAM;gBACP,KAAK,MAAM;oBACV,IAAI,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,SAAS,EAAE;wBACzC,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;wBAC5D,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;wBAClD,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;wBAC9C,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;wBAC9C,IAAI,IAAI,GAAG,EAAE,CAAC;wBAEd,IAAI,cAAc,IAAI,YAAY,IAAI,YAAY,EAAE;4BACnD,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;4BAClD,SAAS,GAAG;gCACX,gBAAgB;gCAChB,SAAS;gCACT,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;gCACf,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;6BACf,CAAC;4BAEF,MAAM,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;4BAC3D,MAAM,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;4BAC3D,IAAI,KAAK,GAAG,CAAC,CAAC;4BAEd,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;4BAC5C,IAAI,IAAI,CAAC,sBAAsB,EAAE;gCAChC,KAAK,GAAG,IAAI,CAAC,sBAAsB,GAAG,QAAQ,CAAC;6BAC/C;4BACD,IAAI,CAAC,sBAAsB,GAAG,QAAQ,CAAC;4BAEvC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,oBAAoB;4BAClC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,oBAAoB;4BAClC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;4BAE1B,IAAI,GAAG;gCACN,SAAS,EAAE,CAAC;gCACZ,OAAO,EAAE,CAAC;gCACV,OAAO,EAAE,CAAC;gCACV,OAAO,EAAE,CAAC;gCACV,OAAO,EAAE,CAAC;gCACV,MAAM,EAAE,CAAC;gCACT,MAAM,EAAE,KAAK;gCACb,MAAM,EAAE,CAAC;6BACT,CAAC;yBACF;wBAED,IAAI,cAAc,IAAI,YAAY,EAAE;4BACnC,MAAM,KAAK,GAAG,SAAS,CAAC,gBAAgB,CAAC;4BACzC,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;4BACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;gCAC/B,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCACnC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCACvC,IAAI,cAAc,EAAE;oCACnB,IAAI,CAAC,MAAM,iCACP,IAAI,CAAC,mBAAmB,CAAC,aAAa,kCAAO,SAAS,KAAE,CAAC,EAAE,CAAC,IAAG,KAClE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAC9B,CAAC;iCACH;gCAED,IAAI,YAAY,EAAE;oCACjB,IAAI,CAAC,MAAM,iCACP,IAAI,CAAC,mBAAmB,CAAC,WAAW,kCAAO,SAAS,KAAE,CAAC,EAAE,CAAC,IAAG,KAChE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAC9B,CAAC;iCACH;6BACD;yBACD;wBAED,IAAI,YAAY,EAAE;4BACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,kCAAO,SAAS,KAAE,IAAI,IAAG,CAAC,CAAC;yBACzE;qBACD;oBACD,MAAM;gBACP;oBACC,MAAM;aACP;SACD;aAAM,IAAI,KAAK,CAAC,SAAS,KAAK,OAAO,EAAE;YACvC,IAAI,MAAM,CAAC,SAAS,EAAE;gBACrB,IAAI,KAAK,CAAC,KAAK,KAAK,iBAAiB,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,iBAAiB,CAAC,OAAO,EAAE;oBACzF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;oBACxB,IAAI,CAAC,sBAAsB,GAAG,CAAC,CAAC;iBAChC;gBACD,IAAI,KAAK,CAAC,KAAK,KAAK,iBAAiB,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,iBAAiB,CAAC,SAAS,EAAE;oBAC3F,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;iBACzB;aACD;iBAAM;gBACN,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;gBAC5D,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,gBAAgB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,iBAAiB,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,iBAAiB,CAAC,OAAO,CAAC,EAAE;oBACzI,IAAI,CAAC,sBAAsB,GAAG,CAAC,CAAC;oBAChC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;iBACxB;gBACD,IAAI,KAAK,CAAC,KAAK,KAAK,iBAAiB,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,iBAAiB,CAAC,SAAS,EAAE;oBAC3F,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;iBACzB;gBACD,IAAI,IAAI,CAAC,WAAW,IAAI,gBAAgB,IAAI,CAAC,EAAE;oBAC9C,IAAI,MAAM,CAAC,KAAK,EAAE;wBACjB,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;wBAClD,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;wBAC9C,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;wBAC9C,IAAI,IAAI,GAAG,EAAE,CAAC;wBACd,IAAI,KAAK,GAAG,CAAC,CAAC;wBACd,IAAI,cAAc,IAAI,YAAY,IAAI,YAAY,EAAE;4BACnD,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;4BAClD,SAAS,GAAG;gCACX,gBAAgB;gCAChB,SAAS;gCACT,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;gCACf,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;6BACf,CAAC;4BAEF,MAAM,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;4BAC3D,MAAM,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;4BAE3D,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;4BAC5C,IAAI,IAAI,CAAC,sBAAsB,EAAE;gCAChC,KAAK,GAAG,IAAI,CAAC,sBAAsB,GAAG,QAAQ,CAAC;6BAC/C;4BACD,IAAI,CAAC,sBAAsB,GAAG,QAAQ,CAAC;4BAEvC,MAAM,CAAC,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;4BAC5B,MAAM,CAAC,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;4BAC5B,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;4BAE1B,IAAI,GAAG;gCACN,SAAS,EAAE,CAAC;gCACZ,OAAO,EAAE,CAAC;gCACV,OAAO,EAAE,CAAC;gCACV,OAAO,EAAE,CAAC;gCACV,OAAO,EAAE,CAAC;gCACV,MAAM,EAAE,CAAC;gCACT,MAAM,EAAE,KAAK;gCACb,MAAM,EAAE,CAAC;6BACT,CAAC;yBACF;wBAED,IAAI,cAAc,IAAI,YAAY,EAAE;4BACnC,MAAM,KAAK,GAAG,SAAS,CAAC,gBAAgB,CAAC;4BACzC,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;4BACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;gCAC/B,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCACnC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;gCACvC,IAAI,cAAc,EAAE;oCACnB,IAAI,CAAC,MAAM,iCACP,IAAI,CAAC,mBAAmB,CAAC,aAAa,kCAAO,SAAS,KAAE,CAAC,EAAE,CAAC,IAAG,KAClE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAC9B,CAAC;iCACH;gCAED,IAAI,YAAY,EAAE;oCACjB,IAAI,CAAC,MAAM,iCACP,IAAI,CAAC,mBAAmB,CAAC,WAAW,kCAAO,SAAS,KAAE,CAAC,EAAE,CAAC,IAAG,KAChE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAC9B,CAAC;iCACH;6BACD;yBACD;wBAED,IAAI,YAAY,EAAE;4BACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,kCAAO,SAAS,KAAE,IAAI,IAAG,CAAC,CAAC;yBACzE;qBACD;iBACD;aACD;SACD;aAAM,IAAI,KAAK,CAAC,SAAS,KAAK,KAAK,EAAE;YACrC,IAAI,IAAI,CAAC,WAAW,EAAE;gBACrB,OAAO;aACP;YACD,IAAI,KAAK,CAAC,KAAK,KAAK,iBAAiB,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,KAAK,iBAAiB,CAAC,OAAO,EAAE;gBACzF,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;gBAClD,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;gBAC9C,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;gBAC9C,IAAI,cAAc,IAAI,YAAY,IAAI,YAAY,EAAE;oBACnD,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;oBAC5D,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;oBAClD,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;oBACvB,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;oBACvB,SAAS,GAAG;wBACX,gBAAgB;wBAChB,SAAS;wBACT,CAAC;wBACD,CAAC;qBACD,CAAC;iBACF;gBAED,IAAI,cAAc,IAAI,YAAY,EAAE;oBACnC,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;oBACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,gBAAgB,EAAE,CAAC,EAAE,EAAE;wBACpD,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;wBACvB,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;wBAC3B,IAAI,cAAc,EAAE;4BACnB,IAAI,CAAC,MAAM,iCACP,IAAI,CAAC,mBAAmB,CAAC,aAAa,EAAE,EAAE,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAC7G,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAC9B,CAAC;yBACH;wBAED,IAAI,YAAY,EAAE;4BACjB,IAAI,CAAC,MAAM,iCACP,IAAI,CAAC,mBAAmB,CAAC,WAAW,EAAE,EAAE,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAC3G,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAC9B,CAAC;yBACH;qBACD;iBACD;gBAED,IAAI,YAAY,EAAE;oBACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;iBAC5D;aACD;SACD;IACF,CAAC;IAED,iBAAiB,CAAC,IAAI,EAAE,SAAS;QAChC,MAAM,KAAK,GAAG,SAAS,CAAC,gBAAgB,CAAC;QACzC,MAAM,KAAK,GAAG,SAAS,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,KAAK,EAAE;YACX,OAAO,IAAI,CAAC;SACZ;QACD,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;QACtB,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;QACtB,MAAM,aAAa,GAAG;YACrB,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;YACV,KAAK,EAAE,GAAG;YACV,UAAU,EAAE,CAAC;YACb,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,CAAC;YACR,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;YACV,aAAa,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;SACV,CAAC;QAEF,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;YAC/B,MAAM,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YACjC,MAAM,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACrC,QAAQ,CAAC,IAAI,CAAC;gBACb,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,GAAG;gBACV,UAAU,EAAE,CAAC;gBACb,KAAK,EAAE,CAAC;gBACR,KAAK,EAAE,CAAC;gBACR,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;gBACV,aAAa,EAAE,CAAC;gBAChB,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,IAAI;aACZ,CAAC,CAAC;SACH;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,kBACxC,SAAS,EAAE,IAAI,EACf,gBAAgB,EAAE,KAAK,EACvB,UAAU,EAAE,KAAK,EACjB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,KAAK,EACd,OAAO,EAAE,KAAK,EACd,QAAQ,EAAE,KAAK,EACf,MAAM,EAAE,IAAI,EACZ,cAAc,EAAE,QAAQ,EACxB,aAAa,EAAE,QAAQ,EACvB,OAAO,EAAE,QAAQ,IACd,aAAa,EACf,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,IAAI,EAAE,SAAS;QAClC,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;QACtB,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC;QACtB,MAAM,aAAa,GAAG;YACrB,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;YACV,KAAK,EAAE,GAAG;YACV,UAAU,EAAE,CAAC;YACb,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,CAAC;YACR,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;YACV,aAAa,EAAE,CAAC;YAChB,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;YACV,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,OAAO;YACpB,CAAC;YACD,CAAC;YACD,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,OAAO;YACf,SAAS,EAAE,IAAI;SACf,CAAC;QAEF,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,gCAC1C,SAAS,EAAE,IAAI,EACf,gBAAgB,EAAE,KAAK,EACvB,UAAU,EAAE,KAAK,EACjB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,KAAK,EACd,OAAO,EAAE,KAAK,EACd,QAAQ,EAAE,KAAK,EACf,MAAM,EAAE,IAAI,IACT,aAAa,KAChB,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC,IACvB,CAAC;IACJ,CAAC;IAED,cAAc,KAAI,CAAC;CACnB,CAAA;AA3rBc,qBAAU,GAAG,OAAQ,CAAA;AADd,UAAU;IAD/B,OAAO,CAAC,QAAQ,CAAC;;GACI,UAAU,CA4rB/B;SA5rBqB,UAAU;AA8rBhC,0BAA0B,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC"}

package/Canvas/index.android.js CHANGED Viewed

@@ -174,18 +174,7 @@ export class Canvas extends CanvasBase {
             return null;
         }
         const getNativeOptions = (options) => {
-            const jsOptions = this._handleContextOptions(type, options);
-            const opts = new java.util.HashMap();
-            Object.keys(jsOptions).forEach((key) => {
-                let val = jsOptions[key];
-                if (typeof val === 'boolean') {
-                    opts.put(key, java.lang.Boolean.valueOf(String(val)));
-                }
-                else {
-                    opts.put(key, val);
-                }
-            });
-            return opts;
+            return JSON.stringify(this._handleContextOptions(type, options));
         };
         if (typeof type === 'string') {
             if (type === '2d') {

package/Canvas/index.android.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../packages/canvas/Canvas/index.android.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAChE,MAAM,UAAU,eAAe;IAC9B,OAAO,IAAI,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC;AAC3E,CAAC;AAED,cAAc,UAAU,CAAC;~~AAGzB~~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~~MAAM,SAAS,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,~~OAAO,~~CAAC,CAAC;YAC5D,MAAM,~~IAAI,~~GAAG,IAAI,IAAI,~~CAAC,~~IAAI,CAAC,OAAO,EAAE,CAAC;YACrC,MAAM,CAAC,IAAI,CAAC,~~SAAS,CAAC,~~CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACtC,~~IAAI,~~GAAG,GAAG,SAAS,~~CAAC,~~GAAG~~,CAAC,~~CAAC;gBACzB,~~IAAI,~~OAAO,GAAG,KAAK,SAAS,~~EAAE~~;oBAC7B~~,~~IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,~~OAAO,CAAC,~~OAAO,~~CAAC,~~MAAM,~~CAAC~~,GAAG,CAAC,CAAC,CAAC,CAAC~~;~~iBACtD;qBAAM;oBACN~~,~~IAAI,~~CAAC,~~GAAG,~~CAAC~~,GAAG,EAAE,GAAG,CAAC,CAAC~~;~~iBACnB;YACF,CAAC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACb,CAAC,CAAC;~~QAEF,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC7B,IAAI,IAAI,KAAK,IAAI,EAAE;gBAClB,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,cAAc,EAAE;oBAC9C,OAAO,IAAI,CAAC;iBACZ;gBACD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;oBACrB,IAAI,CAAC,UAAU,GAAG,IAAI,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBACzG,aAAa;oBACb,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;iBAC/B;qBAAM;oBACN,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;iBACzD;gBACD,aAAa;gBACb,IAAI,CAAC,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC;gBAC7B,OAAO,IAAI,CAAC,UAAU,CAAC;aACvB;iBAAM,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,oBAAoB,EAAE;gBAC7D,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,cAAc,EAAE;oBAC3C,OAAO,IAAI,CAAC;iBACZ;gBACD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;oBACxB,IAAI,CAAC,aAAa,GAAG,IAAI,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBAC5G,IAAI,CAAC,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC;iBAClC;qBAAM;oBACN,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;iBAC5D;gBACD,IAAI,CAAC,aAAa,CAAC,KAAK,GAAG,OAAO,CAAC;gBACnC,OAAO,IAAI,CAAC,aAAa,CAAC;aAC1B;iBAAM,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,qBAAqB,CAAC,EAAE;gBACzE,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,aAAa,EAAE;oBAC1C,OAAO,IAAI,CAAC;iBACZ;gBACD,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;oBACzB,IAAI,CAAC,cAAc,GAAG,IAAI,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBAC9G,IAAI,CAAC,cAAsB,CAAC,OAAO,GAAG,IAAI,CAAC;iBAC5C;qBAAM;oBACN,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;iBAC7D;gBACA,IAAI,CAAC,cAAsB,CAAC,KAAK,GAAG,QAAQ,CAAC;gBAC9C,OAAO,IAAI,CAAC,cAAc,CAAC;aAC3B;SACD;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,qBAAqB;QAUpB,MAAM,IAAI,GAAG,IAAI,CAAC;QAClB,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,OAAO;YACN,MAAM,EAAE,UAAU,CAAC,SAAS,EAAE;YAC9B,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,UAAU,CAAC,OAAO,EAAE;YAC1B,KAAK,EAAE,UAAU,CAAC,QAAQ,EAAE;YAC5B,GAAG,EAAE,UAAU,CAAC,MAAM,EAAE;YACxB,KAAK,EAAE,KAAK;YACZ,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE;YACpB,CAAC,EAAE,UAAU,CAAC,IAAI,EAAE;SACpB,CAAC;IACH,CAAC;~~IAGD~~,iBAAiB,~~KAAK~~,CAAC;~~IAEvB~~,qBAAqB,~~KAAK~~,CAAC;~~CAE3B~~;~~AAvIA~~;IADC,OAAO;;;;sCASP"}
1	+ {"version":3,"file":"index.android.js","sourceRoot":"","sources":["../../../../packages/canvas/Canvas/index.android.ts"],"names":[],"mappings":"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"}

package/Canvas/index.ios.js CHANGED Viewed

@@ -126,7 +126,9 @@ export class Canvas extends CanvasBase {
     }
     initNativeView() {
         super.initNativeView();
-        this._canvas.ignorePixelScaling = this.ignorePixelScaling;
+        if (this.ignorePixelScaling) {
+            this._canvas.ignorePixelScaling = this.ignorePixelScaling;
+        }
     }
     flush() {
         if (this.ios) {
@@ -164,15 +166,7 @@ export class Canvas extends CanvasBase {
             }
             const width = Utils.layout.toDeviceIndependentPixels(size.width || 0);
             const height = Utils.layout.toDeviceIndependentPixels(size.height || 0);
-            let frameSize = this._canvas.frame.size;
-            if (width === frameSize.width && height === frameSize.height) {
-                return;
-            }
-            const frame_origin = this._canvas.frame.origin;
-            const frame = CGRectMake(frame_origin.x, frame_origin.y, width, height);
-            this._canvas.frame = frame;
-            this._canvas.setNeedsLayout();
-            this._canvas.layoutIfNeeded();
+            TNSCanvas.layoutView(this._canvas, width, height);
         }
     }
     getContext(type, options) {
@@ -184,11 +178,16 @@ export class Canvas extends CanvasBase {
                 return null;
             }
             if (!this._2dContext) {
-                this._2dContext = new CanvasRenderingContext2D(this._canvas.getContextContextAttributes(type, this._handleContextOptions(type, options)));
+                if (!options) {
+                    this._2dContext = new CanvasRenderingContext2D(this._canvas.getContext(type));
+                }
+                else {
+                    this._2dContext = new CanvasRenderingContext2D(this._canvas.getContextWithTypeAttributes(type, JSON.stringify(this._handleContextOptions(type, options))));
+                }
                 this._2dContext._canvas = this;
             }
             else {
-                this._canvas.getContextContextAttributes(type, this._handleContextOptions(type, options));
+                this._canvas.getContextContextAttributes(type, this._handleContextOptions(type, JSON.stringify(this._handleContextOptions(type, options))));
             }
             this._2dContext._type = '2d';
             return this._2dContext;
@@ -198,7 +197,12 @@ export class Canvas extends CanvasBase {
                 return null;
             }
             if (!this._webglContext) {
-                this._webglContext = new WebGLRenderingContext(this._canvas.getContextContextAttributes('webgl', this._handleContextOptions(type, options)));
+                if (!options) {
+                    this._webglContext = new WebGLRenderingContext(this._canvas.getContext('webgl'));
+                }
+                else {
+                    this._webglContext = new WebGLRenderingContext(this._canvas.getContextContextAttributes('webgl', this._handleContextOptions(type, options)));
+                }
                 this._webglContext._canvas = this;
             }
             else {
@@ -212,7 +216,12 @@ export class Canvas extends CanvasBase {
                 return null;
             }
             if (!this._webgl2Context) {
-                this._webgl2Context = new WebGL2RenderingContext(this._canvas.getContextContextAttributes('webgl2', this._handleContextOptions(type, options)));
+                if (!options) {
+                    this._webgl2Context = new WebGL2RenderingContext(this._canvas.getContext('webgl2'));
+                }
+                else {
+                    this._webgl2Context = new WebGL2RenderingContext(this._canvas.getContextContextAttributes('webgl2', this._handleContextOptions(type, options)));
+                }
                 this._webgl2Context._canvas = this;
             }
             else {

package/Canvas/index.ios.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/canvas/Canvas/index.ios.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;~~AAIpD~~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~~IAC3D~~,CAAC;IAED,KAAK;QACJ,IAAI,IAAI,CAAC,GAAG,EAAE;YACb,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;SACjB;IACF,CAAC;IAED,UAAU;QACT,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACjB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,KAAK,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAGD,QAAQ;QACP,KAAK,CAAC,QAAQ,EAAE,CAAC;QACjB,IAAI,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YAClB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;SACvB;IACF,CAAC;IAED,iBAAiB;QAChB,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;QAChC,KAAK,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAED,aAAa;QACZ,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YACjB,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE;gBACzJ,OAAO;aACP;YACD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACpB,OAAO;aACP;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC;YAC5B,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,EAAE;gBAC9C,OAAO;aACP;YACD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,yBAAyB,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;YACtE,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,yBAAyB,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;~~YACxE~~,~~IAAI,~~SAAS,~~GAAG,IAAI,~~CAAC,~~OAAO~~,CAAC,~~KAAK,CAAC,~~IAAI,CAAC~~;YAExC~~,~~IAAI,KAAK,KAAK,SAAS,CAAC,KAAK,IAAI,MAAM,KAAK,SAAS,CAAC,MAAM,EAAE;gBAC7D,~~OAAO~~;aACP;YAED~~,~~MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC;YAC/C,MAAM,KAAK,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC,~~EAAE,~~YAAY,CAAC,CAAC,EAAE,~~KAAK,EAAE,MAAM,CAAC,CAAC;~~YACxE,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC~~;~~YAC3B,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YAC9B,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;SAC9B;~~IACF,CAAC;IAED,UAAU,CAAC,IAAY,EAAE,OAAa;QACrC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAClB,OAAO,IAAI,CAAC;SACZ;QACD,IAAI,IAAI,IAAI,IAAI,KAAK,IAAI,EAAE;YAC1B,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,cAAc,EAAE;gBAC9C,OAAO,IAAI,CAAC;aACZ;YACD,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;gBACrB,IAAI,CAAC,UAAU,GAAG,IAAI,wBAAwB,CAAC,IAAI,CAAC,OAAO,CAAC,~~2BAA2B~~,CAAC,IAAI,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;~~gBAC1I~~,IAAI,CAAC,UAAU,CAAC,OAAO,GAAG,IAAI,CAAC;aAC/B;iBAAM;gBACN,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,IAAI,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;~~aAC1F~~;YACD,IAAI,CAAC,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC;YAC7B,OAAO,IAAI,CAAC,UAAU,CAAC;SACvB;aAAM,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,oBAAoB,CAAC,EAAE;YACvE,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,cAAc,EAAE;gBAC3C,OAAO,IAAI,CAAC;aACZ;YACD,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBACxB,IAAI,CAAC,aAAa,GAAG,IAAI,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,OAAO,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;~~gBAC7I~~,IAAI,CAAC,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC;aAClC;iBAAM;gBACN,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,OAAO,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;aAC7F;YACD,IAAI,CAAC,aAAa,CAAC,KAAK,GAAG,OAAO,CAAC;YACnC,OAAO,IAAI,CAAC,aAAa,CAAC;SAC1B;aAAM,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,qBAAqB,CAAC,EAAE;YACzE,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,aAAa,EAAE;gBAC1C,OAAO,IAAI,CAAC;aACZ;YACD,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;gBACzB,IAAI,CAAC,cAAc,GAAG,IAAI,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,QAAQ,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;~~gBAC/I~~,IAAI,CAAC,cAAsB,CAAC,OAAO,GAAG,IAAI,CAAC;aAC5C;iBAAM;gBACN,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,QAAQ,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;aAC9F;YACA,IAAI,CAAC,cAAsB,CAAC,KAAK,GAAG,OAAO,CAAC;YAC7C,OAAO,IAAI,CAAC,cAAc,CAAC;SAC3B;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,SAAS,CAAC,IAAI,GAAG,WAAW,EAAE,cAAc,GAAG,IAAI;QAClD,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACrD,CAAC;IAED,qBAAqB;QAUpB,MAAM,IAAI,GAAG,IAAI,CAAC;QAClB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAe,CAAC;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,OAAO;YACN,MAAM,EAAE,MAAM;YACd,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YACpB,KAAK,EAAE,KAAK;YACZ,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YACnB,KAAK,EAAE,KAAK;YACZ,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YACjB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;SACjB,CAAC;IACH,CAAC;~~CAED~~;~~AArHA~~;IADC,OAAO;;;;sCAOP"}
1	+ {"version":3,"file":"index.ios.js","sourceRoot":"","sources":["../../../../packages/canvas/Canvas/index.ios.ts"],"names":[],"mappings":"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"}

package/Canvas2D/CanvasPattern/CanvasPattern.ios.d.ts CHANGED Viewed

@@ -3,4 +3,5 @@ import { DOMMatrix } from '../DOMMatrix/DOMMatrix';
 export declare class CanvasPattern extends CanvasPatternBase {
     constructor(instance: any);
     setTransform(matrix: DOMMatrix): void;
+    get [Symbol.toStringTag](): string;
 }

package/Canvas2D/CanvasPattern/CanvasPattern.ios.js CHANGED Viewed

@@ -6,5 +6,8 @@ export class CanvasPattern extends CanvasPatternBase {
     setTransform(matrix) {
         this.native.setTransformWithMatrix(matrix.native);
     }
+    get [Symbol.toStringTag]() {
+        return 'CanvasPattern';
+    }
 }
 //# sourceMappingURL=CanvasPattern.ios.js.map

package/Canvas2D/CanvasPattern/CanvasPattern.ios.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CanvasPattern.ios.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasPattern/CanvasPattern.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG7C,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IACnD,YAAY,QAAa;QACxB,KAAK,CAAC,QAAQ,CAAC,CAAC;IACjB,CAAC;IACM,YAAY,CAAC,MAAiB;QACpC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;CACD"}
1	+ {"version":3,"file":"CanvasPattern.ios.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasPattern/CanvasPattern.ios.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG7C,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IACnD,YAAY,QAAa;QACxB,KAAK,CAAC,QAAQ,CAAC,CAAC;IACjB,CAAC;IACM,YAAY,CAAC,MAAiB;QACpC,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;QACvB,OAAO,eAAe,CAAA;IACvB,CAAC;CACD"}

package/Canvas2D/CanvasRenderingContext2D/common.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { CanvasRenderingContext } from "../../common";
+import { CanvasRenderingContext } from '../../common';
 import { CanvasGradient } from '../CanvasGradient';
 import { CanvasPattern } from '../CanvasPattern';
 import { Path2D } from '../Path2D';
@@ -68,6 +68,8 @@ export declare abstract class CanvasRenderingContext2DBase implements CanvasRend
     abstract putImageData(imageData: ImageData, dx: number, dy: number, dirtyX: number, dirtyY: number, dirtyWidth: number, dirtyHeight: number): void;
     abstract quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): any;
     abstract rect(x: number, y: number, width: number, height: number): void;
+    abstract roundRect(x: number, y: number, width: number, height: number, radii: number): void;
+    abstract roundRect(x: number, y: number, width: number, height: number, radii: number[]): void;
     abstract removeHitRegion(id: string): void;
     abstract resetTransform(): void;
     abstract restore(): void;

package/Canvas2D/CanvasRenderingContext2D/common.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasRenderingContext2D/common.ts"],"names":[],"mappings":"AAOA,MAAM,OAAgB,4BAA4B;IAAlD;~~QA2BC~~,UAAK,GAAW,MAAM,CAAC;~~IAyPxB~~,CAAC;~~IA7PA~~,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAGD,IAAI,IAAI;QACP,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;~~CAsPD~~"}
1	+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../packages/canvas/Canvas2D/CanvasRenderingContext2D/common.ts"],"names":[],"mappings":"AAOA,MAAM,OAAgB,4BAA4B;IAAlD;QA0BC,UAAK,GAAW,MAAM,CAAC;IAmHxB,CAAC;IAvHA,IAAI,MAAM;QACT,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAGD,IAAI,IAAI;QACP,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;CAgHD"}