@leafer-ui/data 1.8.0 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/data",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "@leafer-ui/data",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,11 +22,11 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/core": "1.8.0",
-    "@leafer-ui/external": "1.8.0"
+    "@leafer/core": "1.9.0",
+    "@leafer-ui/external": "1.9.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.8.0",
-    "@leafer-ui/interface": "1.8.0"
+    "@leafer/interface": "1.9.0",
+    "@leafer-ui/interface": "1.9.0"
   }
 }

package/src/TextData.ts

@@ -1,4 +1,4 @@
-import { UICreator } from '@leafer/core'
+import { UICreator, isString } from '@leafer/core'
 
 import { IFontWeight, ITextData, IUI, IText, IObject, IBackgroundBoxStyle, IFontWeightNumer } from '@leafer-ui/interface'
 
@@ -25,7 +25,7 @@ export class TextData extends UIData implements ITextData {
     protected _boxStyle?: IBackgroundBoxStyle
 
     setFontWeight(value: IFontWeight): void {
-        if (typeof value === 'string') {
+        if (isString(value)) {
             this.__setInput('fontWeight', value)
             value = fontWeightMap[value] as IFontWeightNumer || 400
         } else if (this.__input) this.__removeInput('fontWeight')

package/src/UIData.ts

@@ -1,5 +1,5 @@
 import { INumber, IValue, IBoolean, IPathCommandData, IPathString, IPointData, IPathCommandObject, IObject, IFilter } from '@leafer/interface'
-import { PathConvert, DataHelper, LeafData, Debug } from '@leafer/core'
+import { PathConvert, DataHelper, LeafData, Debug, isArray, isObject, isString, isUndefined } from '@leafer/core'
 
 import { IUI, IUIData, ILeafPaint, IStrokeComputedStyle } from '@leafer-ui/interface'
 import { Paint, PaintImage, ColorConvert } from '@leafer-ui/external'
@@ -84,31 +84,31 @@ export class UIData extends LeafData implements IUIData {
 
     protected setFill(value: IValue) {
         if (this.__naturalWidth) this.__removeNaturalSize()
-        if (typeof value === 'string' || !value) {
+        if (isString(value) || !value) {
             stintSet(this, '__isTransparentFill', hasTransparent(value as string))
             this.__isFills && this.__removePaint('fill', true)
             this._fill = value
-        } else if (typeof value === 'object') {
+        } else if (isObject(value)) {
             this.__setPaint('fill', value)
         }
     }
 
     protected setStroke(value: IValue) {
-        if (typeof value === 'string' || !value) {
+        if (isString(value) || !value) {
             stintSet(this, '__isTransparentStroke', hasTransparent(value as string))
             this.__isStrokes && this.__removePaint('stroke', true)
             this._stroke = value
-        } else if (typeof value === 'object') {
+        } else if (isObject(value)) {
             this.__setPaint('stroke', value)
         }
     }
 
 
     protected setPath(value: IPathCommandData | IPathCommandObject[] | IPathString) {
-        const isString = typeof value === 'string'
-        if (isString || (value && typeof value[0] === 'object')) {
+        const isStr = isString(value)
+        if (isStr || (value && isObject(value[0]))) {
             this.__setInput('path', value)
-            this._path = isString ? parse(value) : objectToCanvasData(value as IPathCommandObject[])
+            this._path = isStr ? parse(value) : objectToCanvasData(value as IPathCommandObject[])
         } else {
             if (this.__input) this.__removeInput('path')
             this._path = value as IPathCommandData
@@ -143,7 +143,7 @@ export class UIData extends LeafData implements IUIData {
         let { strokeWidth, strokeWidthFixed } = this as IUIData
         if (childStyle) {
             if (childStyle.strokeWidth) strokeWidth = childStyle.strokeWidth
-            if (childStyle.strokeWidthFixed !== undefined) strokeWidthFixed = childStyle.strokeWidthFixed
+            if (!isUndefined(childStyle.strokeWidthFixed)) strokeWidthFixed = childStyle.strokeWidthFixed
         }
         if (strokeWidthFixed) {
             const scale = this.__leaf.getClampRenderScale()
@@ -156,7 +156,7 @@ export class UIData extends LeafData implements IUIData {
         this.__setInput(attrName, value)
         const layout = this.__leaf.__layout
         layout.boxChanged || layout.boxChange()
-        if (value instanceof Array && !value.length) {
+        if (isArray(value) && !value.length) {
             this.__removePaint(attrName)
         } else {
             if (attrName === 'fill') this.__isFills = true, this._fill || (this._fill = emptyPaint)
@@ -181,7 +181,7 @@ export class UIData extends LeafData implements IUIData {
 
 function setArray(data: IUIData, key: string, value: IValue) {
     data.__setInput(key, value)
-    if (value instanceof Array) {
+    if (isArray(value)) {
         if (value.some((item: IFilter) => item.visible === false)) value = value.filter((item: IFilter) => item.visible !== false)
         value.length || (value = undefined)
     } else value = value && (value as IFilter).visible !== false ? [value] : undefined;