@fugood/bricks-project 2.23.0-beta.4 → 2.23.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.23.0-beta.4",
+  "version": "2.23.0-beta.6",
   "main": "index.ts",
   "scripts": {
     "build": "node scripts/build.js"
@@ -14,5 +14,5 @@
     "lodash": "^4.17.4",
     "uuid": "^8.3.1"
   },
-  "gitHead": "60e1e023f5bcd5bacfcad631994462a8dcab9d47"
+  "gitHead": "98664299bda5a920ff1096e2e62c68fd7c85a573"
 }

package/types/bricks/Slideshow.ts

@@ -34,6 +34,26 @@ export type BrickSlideshowActionJumpToIndex = ActionWithParams & {
   >
 }
 
+/* Play the slideshow (resume if paused) */
+export type BrickSlideshowActionPlay = Action & {
+  __actionName: 'BRICK_SLIDESHOW_PLAY'
+}
+
+/* Pause the slideshow */
+export type BrickSlideshowActionPause = Action & {
+  __actionName: 'BRICK_SLIDESHOW_PAUSE'
+}
+
+/* Go to next slide */
+export type BrickSlideshowActionNext = Action & {
+  __actionName: 'BRICK_SLIDESHOW_NEXT'
+}
+
+/* Go to previous slide */
+export type BrickSlideshowActionPrev = Action & {
+  __actionName: 'BRICK_SLIDESHOW_PREV'
+}
+
 interface BrickSlideshowDef {
   /*
 Default property:
@@ -41,17 +61,28 @@ Default property:
   "countdown": 2000,
   "loop": true,
   "shuffle": false,
+  "photoResizeMode": "contain",
+  "photoLoadSystemIos": "auto",
+  "photoLoadSystemAndroid": "auto",
+  "videoResizeMode": "contain",
+  "videoAutoAspectRatio": false,
   "videoVolume": 100,
+  "videoMuted": false,
+  "videoRenderMode": "auto",
+  "fadeDuration": 0,
   "emptyViewText": "no available image item to show",
   "emptyViewTextSize": 44,
   "emptyViewTextColor": "#fff",
+  "enableBlurBackground": false,
   "blurBackgroundRadius": 8
 }
   */
   property?: BrickBasicProperty & {
     /* The time interval of show for each photo */
     countdown?: number | DataLink
-    /* The slideshow media path list (File, URL) */
+    /* The slideshow media path list (File, URL)  
+ Each path object can override global photo/video settings.  
+ Item-level properties take precedence over brick-level properties. */
     paths?:
       | Array<
           | DataLink
@@ -70,7 +101,8 @@ Default property:
             }
         >
       | DataLink
-    /* Multiple slideshow media path lists to combine (Array of path arrays) */
+    /* Multiple slideshow media path lists to combine (Array of path arrays).  
+ All arrays are flattened and combined: [...paths, ...pathsList[0], ...pathsList[1], ...] */
     pathsList?: Array<Array<any> | DataLink | DataLink> | DataLink
     /* Loop the slideshow */
     loop?: boolean | DataLink
@@ -122,6 +154,8 @@ Default property:
     roundEnd?: Array<EventAction>
     /* Event of the slideshow on load */
     mediaOnLoad?: Array<EventAction>
+    /* Event of the slideshow media loading error */
+    mediaOnError?: Array<EventAction>
   }
   animation?: AnimationBasicEvents & {
     changeStart?: Animation
@@ -129,6 +163,7 @@ Default property:
     contentChange?: Animation
     roundEnd?: Animation
     mediaOnLoad?: Animation
+    mediaOnError?: Animation
   }
 }
 

package/types/generators/CanvasMap.ts

@@ -31,10 +31,21 @@ Default property:
         >
       | DataLink
   }
-  outlets?: {}
+  events?: {
+    /* Event triggered when a rule matches and canvas navigation occurs */
+    onNavigate?: Array<EventAction>
+  }
+  outlets?: {
+    /* Last matched trigger rule that caused canvas navigation */
+    lastMatchedRule?: () => Data
+    /* Index of the last matched rule in triggerList */
+    lastMatchedIndex?: () => Data
+    /* Total count of canvas navigations triggered by this generator */
+    navigationCount?: () => Data
+  }
 }
 
-/* Trigger change canvas by setup rules */
+/* Trigger canvas navigation by setup rules */
 export type GeneratorCanvasMap = Generator &
   GeneratorCanvasMapDef & {
     templateKey: 'GENERATOR_CANVAS_MAP'
@@ -48,7 +59,7 @@ export type GeneratorCanvasMap = Generator &
               | SwitchCondData
               | {
                   __typename: 'SwitchCondInnerStateOutlet'
-                  outlet: ''
+                  outlet: 'lastMatchedRule' | 'lastMatchedIndex' | 'navigationCount'
                   value: any
                 }
           }>

package/utils/event-props.ts

@@ -55,6 +55,11 @@ export const templateEventPropsMap = {
       'BRICK_SLIDESHOW_PAYLOAD_VALUE', // type: number
       'BRICK_SLIDESHOW_ORIGINAL_INDEX', // type: number
     ],
+    mediaOnError: [
+      'BRICK_SLIDESHOW_ERROR_MESSAGE', // type: string
+      'BRICK_SLIDESHOW_ERROR_URL', // type: string
+      'BRICK_SLIDESHOW_ERROR_INDEX', // type: number
+    ],
   },
   BRICK_CHART: {
     onPress: [
@@ -371,7 +376,16 @@ export const templateEventPropsMap = {
       'GENERATOR_WEB_SOCKET_MESSAGE', // type: any
     ],
   },
-
+  GENERATOR_CANVAS_MAP: {
+    onNavigate: [
+      'GENERATOR_CANVAS_MAP_MATCHED_RULE', // type: object
+      'GENERATOR_CANVAS_MAP_MATCHED_INDEX', // type: number
+      'GENERATOR_CANVAS_MAP_TARGET_CANVAS_ID', // type: string
+      'GENERATOR_CANVAS_MAP_TARGET_CANVAS_TITLE_LIKE', // type: string
+      'GENERATOR_CANVAS_MAP_PROPERTY_VALUE', // type: any
+      'GENERATOR_CANVAS_MAP_PREVIOUS_VALUE', // type: any
+    ],
+  },
   GENERATOR_STEP: {
     onStep: [
       'GENERATOR_STEP_PAYLOAD', // type: string