@fugood/bricks-project 2.22.1 → 2.23.0-beta.1

package/compile/action-name-map.ts

@@ -304,19 +304,6 @@ export const templateActionNameMap = {
     },
   },
 
-  BRICK_3D_VIEWER: {
-    BRICK_3D_VIEWER_ANIMATION_PLAY: {
-      objectIndex: 'BRICK_3D_VIEWER_OBJECT_INDEX',
-    },
-    BRICK_3D_VIEWER_ANIMATION_PAUSE: {
-      objectIndex: 'BRICK_3D_VIEWER_OBJECT_INDEX',
-    },
-    BRICK_3D_VIEWER_ANIMATION_GOTO: {
-      objectIndex: 'BRICK_3D_VIEWER_OBJECT_INDEX',
-      animationProgress: 'BRICK_3D_VIEWER_ANIMATION_PROGRESS',
-    },
-  },
-
   GENERATOR_FILE: {
     GENERATOR_FILE_READ_CONTENT: {
       encoding: 'ENCODING',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.22.1",
+  "version": "2.23.0-beta.1",
   "main": "index.ts",
   "scripts": {
     "build": "node scripts/build.js"
@@ -13,5 +13,6 @@
     "escodegen": "^2.1.0",
     "lodash": "^4.17.4",
     "uuid": "^8.3.1"
-  }
+  },
+  "gitHead": "8d613e8b77ae47fde21212b9e9f77a3cc4e7278d"
 }

package/types/bricks/Chart.ts

@@ -255,6 +255,7 @@ interface BrickChartDef {
   /*
 Default property:
 {
+  "renderMode": "svg",
   "legendShow": true,
   "xAxisShow": true,
   "xAxisType": "category",
@@ -265,6 +266,8 @@ Default property:
 }
   */
   property?: BrickBasicProperty & {
+    /* The render mode */
+    renderMode?: 'svg' | 'skia' | DataLink
     /* Theme. You can use https://echarts.apache.org/en/theme-builder.html to generate theme */
     themeEntry?: {} | DataLink
     /* Theme of URL (.json) */

package/types/bricks/GenerativeMedia.ts

@@ -198,6 +198,8 @@ Default property:
     url?: () => Data
     /* Generated media error */
     error?: () => Data
+    /* Loading state */
+    loading?: () => Data
   }
   animation?: AnimationBasicEvents & {
     generativeMediaOnPress?: Animation
@@ -231,7 +233,7 @@ export type GenerativeMedia = Brick &
               | SwitchCondData
               | {
                   __typename: 'SwitchCondInnerStateOutlet'
-                  outlet: 'brickPressing' | 'brickFocusing' | 'url' | 'error'
+                  outlet: 'brickPressing' | 'brickFocusing' | 'url' | 'error' | 'loading'
                   value: any
                 }
           }>

package/types/bricks/WebView.ts

@@ -75,7 +75,7 @@ Default property:
     /* The WebView content URL */
     url?: string | DataLink
     /* The request headers to load content */
-    headers?: {} | DataLink
+    headers?: Record<string, string | DataLink> | DataLink
     /* The request UserAgent */
     userAgent?: string | DataLink
     /* The webview content HTML (Use `url` first) */
@@ -100,7 +100,7 @@ Default property:
     cacheEnabled?: boolean | DataLink
     /* Enable Geolocation */
     geolocationEnabled?: boolean | DataLink
-    /* Enable Third Party Cooikies */
+    /* Enable Third Party Cookies */
     thirdPartyCookiesEnabled?: boolean | DataLink
     /* Enable JavaScript */
     javaScriptEnabled?: boolean | DataLink

package/types/system.ts

@@ -594,7 +594,7 @@ export type SystemActionThrowException = ActionWithParams & {
   params?: Array<
     | {
         input: 'behavior'
-        value?: 'application' | 'application-render' | 'native' | DataLink | EventProperty
+        value?: 'application' | 'native' | DataLink | EventProperty
         mapping?: string
       }
     | {

package/utils/event-props.ts

@@ -180,23 +180,6 @@ export const templateEventPropsMap = {
     ],
   },
 
-  BRICK_3D_VIEWER: {
-    onError: [
-      'BRICK_3D_VIEWER_ERROR_MESSAGE', // type: string
-    ],
-    onChange: [
-      'BRICK_3D_VIEWER_OBJECT_INDEX', // type: number
-      'BRICK_3D_VIEWER_OBJECT_POSITION', // type: object
-      'BRICK_3D_VIEWER_OBJECT_ROTATION', // type: object
-    ],
-    onSelectChange: [
-      'BRICK_3D_VIEWER_OBJECT_INDEX', // type: number
-    ],
-    onCollision: [
-      'BRICK_3D_VIEWER_OBJECT_INDEX', // type: number
-      'BRICK_3D_VIEWER_COLLISION_TYPE', // type: string
-    ],
-  },
   BRICK_GENERATIVE_MEDIA: {
     onSuccess: [
       'BRICK_GENERATIVE_MEDIA_URL', // type: string

package/types/bricks/3DViewer.ts

@@ -1,200 +0,0 @@
-import type { SwitchCondInnerStateCurrentCanvas, SwitchCondData, SwitchDef } from '../switch'
-import type { Data, DataLink } from '../data'
-import type { Animation, AnimationBasicEvents } from '../animation'
-import type {
-  Brick,
-  EventAction,
-  EventActionForItem,
-  ActionWithDataParams,
-  ActionWithParams,
-  Action,
-  EventProperty,
-} from '../common'
-import type { BrickBasicProperty, BrickBasicEvents, BrickBasicEventsForItem } from '../brick-base'
-
-/* Play object animation */
-export type Brick3DViewerActionAnimationPlay = ActionWithParams & {
-  __actionName: 'BRICK_3D_VIEWER_ANIMATION_PLAY'
-  params?: Array<{
-    input: 'objectIndex'
-    value?: number | DataLink | EventProperty
-    mapping?: string
-  }>
-}
-
-/* Pause object animation */
-export type Brick3DViewerActionAnimationPause = ActionWithParams & {
-  __actionName: 'BRICK_3D_VIEWER_ANIMATION_PAUSE'
-  params?: Array<{
-    input: 'objectIndex'
-    value?: number | DataLink | EventProperty
-    mapping?: string
-  }>
-}
-
-/* Goto object animation progress */
-export type Brick3DViewerActionAnimationGoto = ActionWithParams & {
-  __actionName: 'BRICK_3D_VIEWER_ANIMATION_GOTO'
-  params?: Array<
-    | {
-        input: 'objectIndex'
-        value?: number | DataLink | EventProperty
-        mapping?: string
-      }
-    | {
-        input: 'animationProgress'
-        value?: number | DataLink | EventProperty
-        mapping?: string
-      }
-  >
-}
-
-interface Brick3DViewerDef {
-  /*
-Default property:
-{
-  "showLoadingBox": true,
-  "enableOrbitControls": true
-}
-  */
-  property?: BrickBasicProperty & {
-    /* 3D model list */
-    objects?:
-      | Array<
-          | DataLink
-          | {
-              url?: string | DataLink
-              md5?: string | DataLink
-              type?: 'USDZ' | 'glTF' | DataLink
-              rotation?: number | DataLink | Array<number | DataLink> | DataLink | DataLink
-              scale?: number | DataLink | Array<number | DataLink> | DataLink | DataLink
-              x?: number | DataLink
-              y?: number | DataLink
-              z?: number | DataLink
-              moveable?: boolean | DataLink
-              rotateable?: boolean | DataLink
-              selectable?: boolean | DataLink
-              enableCollision?: boolean | DataLink
-              animationLoopMode?: 'once' | 'repeat' | 'pingpong' | DataLink
-              animationProgress?: number | DataLink
-              animationPaused?: boolean | DataLink
-              boundingBox?:
-                | DataLink
-                | {
-                    min?:
-                      | DataLink
-                      | {
-                          x?: number | DataLink
-                          y?: number | DataLink
-                          z?: number | DataLink
-                        }
-                    max?:
-                      | DataLink
-                      | {
-                          x?: number | DataLink
-                          y?: number | DataLink
-                          z?: number | DataLink
-                        }
-                  }
-            }
-        >
-      | DataLink
-    /* Show loading placeholder box */
-    showLoadingBox?: boolean | DataLink
-    /* Display shadows */
-    shadows?: boolean | DataLink
-    /* Default camera position */
-    camera?:
-      | DataLink
-      | {
-          fov?: number | DataLink
-          aspect?: number | DataLink
-          near?: number | DataLink
-          far?: number | DataLink
-          position?:
-            | DataLink
-            | {
-                x?: number | DataLink
-                y?: number | DataLink
-                z?: number | DataLink
-              }
-          quaternion?:
-            | DataLink
-            | {
-                x?: number | DataLink
-                y?: number | DataLink
-                z?: number | DataLink
-                w?: number | DataLink
-              }
-        }
-    /* Enable orbit controls */
-    enableOrbitControls?: boolean | DataLink
-    /* Camera control options */
-    orbitControls?:
-      | DataLink
-      | {
-          autoRotate?: boolean | DataLink
-          enableZoom?: boolean | DataLink
-          enablePan?: boolean | DataLink
-          enableRotate?: boolean | DataLink
-          enableDamping?: boolean | DataLink
-          dampingFactor?: number | DataLink
-          rotateSpeed?: number | DataLink
-          zoomSpeed?: number | DataLink
-          panSpeed?: number | DataLink
-          minDistance?: number | DataLink
-          maxDistance?: number | DataLink
-          minPolarAngle?: number | DataLink
-          maxPolarAngle?: number | DataLink
-          minAzimuthAngle?: number | DataLink
-          maxAzimuthAngle?: number | DataLink
-        }
-    /* Move controls options */
-    moveControls?:
-      | DataLink
-      | {
-          responsiveness?: number | DataLink
-          rotationRingColor?: string | DataLink
-          rotationRingSize?: number | DataLink
-          showBoundingBox?: boolean | DataLink
-        }
-  }
-  events?: BrickBasicEvents & {
-    /* Event of error occurred */
-    onError?: Array<EventAction>
-    /* Event of object changed position or rotation */
-    onChange?: Array<EventAction>
-    /* Event of object selected */
-    onSelectChange?: Array<EventAction>
-    /* Event of object collision occurred */
-    onCollision?: Array<EventAction>
-  }
-  animation?: AnimationBasicEvents & {
-    onError?: Animation
-    onChange?: Animation
-    onSelectChange?: Animation
-    onCollision?: Animation
-  }
-}
-
-/* 3D viewer brick */
-export type Brick3DViewer = Brick &
-  Brick3DViewerDef & {
-    templateKey: 'BRICK_3D_VIEWER'
-    switches: Array<
-      SwitchDef &
-        Brick3DViewerDef & {
-          conds?: Array<{
-            method: '==' | '!=' | '>' | '<' | '>=' | '<='
-            cond:
-              | SwitchCondInnerStateCurrentCanvas
-              | SwitchCondData
-              | {
-                  __typename: 'SwitchCondInnerStateOutlet'
-                  outlet: ''
-                  value: any
-                }
-          }>
-        }
-    >
-  }