@routevn/creator-model 1.5.2 → 1.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routevn/creator-model",
-  "version": "1.5.2",
+  "version": "1.6.2",
   "private": false,
   "type": "module",
   "license": "MIT",

package/src/model.js

@@ -343,6 +343,7 @@ const LAYOUT_TYPE_KEYS = [
 ];
 const LAYOUT_ELEMENT_TEXT_STYLE_ALIGN_KEYS = ["left", "center", "right"];
 const LAYOUT_TEXT_REVEAL_EFFECT_KEYS = ["typewriter", "softWipe", "none"];
+const LAYOUT_ELEMENT_BLUR_KERNEL_SIZE_OPTIONS = [5, 7, 9, 11, 13, 15];
 const CONTROL_KEYBOARD_KEYS = [
   "enter",
   "space",
@@ -381,7 +382,7 @@ const LAYOUT_ELEMENT_BASE_TYPES = [
   "container-ref-confirm-dialog-ok",
   "container-ref-confirm-dialog-cancel",
 ];
-export const SCHEMA_VERSION = 5;
+export const SCHEMA_VERSION = 6;
 const LAYOUT_CONTAINER_ELEMENT_TYPES = [
   "folder",
   "container",
@@ -3348,6 +3349,56 @@ const validateLayoutElementInteraction = ({
   }
 };
 
+const validateLayoutElementBlur = ({ blur, path, errorFactory }) => {
+  if (!isPlainObject(blur)) {
+    return invalidFromErrorFactory(
+      errorFactory,
+      `${path} must be an object when provided`,
+    );
+  }
+
+  {
+    const result = validateAllowedKeys({
+      value: blur,
+      allowedKeys: ["x", "y", "quality", "kernelSize", "repeatEdgePixels"],
+      path,
+      errorFactory,
+    });
+    if (result?.valid === false) {
+      return result;
+    }
+  }
+
+  for (const key of ["x", "y", "quality"]) {
+    if (blur[key] !== undefined && !isFiniteNumber(blur[key])) {
+      return invalidFromErrorFactory(
+        errorFactory,
+        `${path}.${key} must be a finite number when provided`,
+      );
+    }
+  }
+
+  if (
+    blur.kernelSize !== undefined &&
+    !LAYOUT_ELEMENT_BLUR_KERNEL_SIZE_OPTIONS.includes(blur.kernelSize)
+  ) {
+    return invalidFromErrorFactory(
+      errorFactory,
+      `${path}.kernelSize must be one of ${LAYOUT_ELEMENT_BLUR_KERNEL_SIZE_OPTIONS.join(", ")} when provided`,
+    );
+  }
+
+  if (
+    blur.repeatEdgePixels !== undefined &&
+    typeof blur.repeatEdgePixels !== "boolean"
+  ) {
+    return invalidFromErrorFactory(
+      errorFactory,
+      `${path}.repeatEdgePixels must be a boolean when provided`,
+    );
+  }
+};
+
 const validateLayoutElementData = ({
   data,
   path,
@@ -3372,6 +3423,7 @@ const validateLayoutElementData = ({
     "scaleY",
     "rotation",
     "opacity",
+    "blur",
     "fill",
     "border",
     "text",
@@ -3506,6 +3558,26 @@ const validateLayoutElementData = ({
     );
   }
 
+  if (data.blur !== undefined) {
+    {
+      const result = validateLayoutElementBlur({
+        blur: data.blur,
+        path: `${path}.blur`,
+        errorFactory,
+      });
+      if (result?.valid === false) {
+        return result;
+      }
+    }
+
+    if (data.type !== undefined && data.type !== "sprite") {
+      return invalidFromErrorFactory(
+        errorFactory,
+        `${path}.blur can only be provided for sprite elements`,
+      );
+    }
+  }
+
   for (const key of [
     "text",
     "resourceId",
@@ -3947,6 +4019,7 @@ const validateLayoutElementItems = ({ items, path, errorFactory }) => {
           "scaleY",
           "rotation",
           "opacity",
+          "blur",
           "fill",
           "border",
           "text",
@@ -11090,6 +11163,18 @@ const validateVisualElementReferenceTargets = ({
   state,
   errorFactory,
 }) => {
+  if (data.blur !== undefined && data.type !== "sprite") {
+    return invalidFromErrorFactory(
+      errorFactory,
+      `${ownerLabel} element blur can only be provided for sprite elements`,
+      {
+        [ownerIdField]: ownerId,
+        elementId,
+        field: "blur",
+      },
+    );
+  }
+
   if (
     data.type === "spritesheet-animation" ||
     data.resourceId !== undefined ||
@@ -13181,6 +13266,7 @@ const COMMAND_DEFINITIONS = [
           value: payload,
           allowedKeys: [
             "sectionId",
+            "sceneId",
             "parentId",
             "index",
             "position",
@@ -13198,6 +13284,12 @@ const COMMAND_DEFINITIONS = [
         return invalidPayload("payload.sectionId must be a non-empty string");
       }
 
+      if (payload.sceneId !== undefined && !isNonEmptyString(payload.sceneId)) {
+        return invalidPayload(
+          "payload.sceneId must be a non-empty string when provided",
+        );
+      }
+
       if (
         payload.parentId !== undefined &&
         payload.parentId !== null &&
@@ -13229,10 +13321,42 @@ const COMMAND_DEFINITIONS = [
         );
       }
 
+      const targetSceneId = payload.sceneId ?? location.sceneId;
+      const targetScene = state.scenes.items[targetSceneId];
+      if (!isPlainObject(targetScene)) {
+        return invalidPrecondition(
+          "payload.sceneId must reference an existing scene",
+        );
+      }
+
+      if (targetScene.type !== "scene") {
+        return invalidPrecondition(
+          "payload.sceneId must reference a non-folder scene",
+        );
+      }
+
+      const targetSections =
+        targetScene.sections ?? createEmptyNestedCollection();
       const sectionNode = findTreeNode({
         nodes: location.sections.tree,
         nodeId: payload.sectionId,
       });
+      const isCrossSceneMove = targetSceneId !== location.sceneId;
+
+      if (isCrossSceneMove) {
+        const sourceSectionCount = Object.keys(
+          location.sections?.items ?? {},
+        ).length;
+        const movedSectionCount = collectTreeDescendantIds({
+          node: sectionNode,
+        }).length;
+
+        if (sourceSectionCount <= movedSectionCount) {
+          return invalidPrecondition(
+            "payload.sectionId must not move the last section out of a scene",
+          );
+        }
+      }
 
       if (payload.parentId !== undefined && payload.parentId !== null) {
         const parentLocation = findSectionLocation({
@@ -13245,9 +13369,9 @@ const COMMAND_DEFINITIONS = [
           );
         }
 
-        if (parentLocation.sceneId !== location.sceneId) {
+        if (parentLocation.sceneId !== targetSceneId) {
           return invalidPrecondition(
-            "payload.parentId must reference a section in the same scene",
+            "payload.parentId must reference a section in the target scene",
           );
         }
 
@@ -13281,14 +13405,14 @@ const COMMAND_DEFINITIONS = [
           );
         }
 
-        if (targetLocation.sceneId !== location.sceneId) {
+        if (targetLocation.sceneId !== targetSceneId) {
           return invalidPrecondition(
-            "payload.positionTargetId must reference a section in the same scene",
+            "payload.positionTargetId must reference a section in the target scene",
           );
         }
 
         const targetParentId = getNodeParentId({
-          tree: location.sections.tree,
+          tree: targetSections.tree,
           nodeId: payload.positionTargetId,
         });
 
@@ -13304,6 +13428,10 @@ const COMMAND_DEFINITIONS = [
         state,
         sectionId: payload.sectionId,
       });
+      const targetSceneId = payload.sceneId ?? location.sceneId;
+      const targetScene = state.scenes.items[targetSceneId];
+      targetScene.sections ??= createEmptyNestedCollection();
+      const targetSections = targetScene.sections;
       const sectionNodeResult = removeNodeOrResult({
         tree: location.sections.tree,
         nodeId: payload.sectionId,
@@ -13313,8 +13441,20 @@ const COMMAND_DEFINITIONS = [
         return sectionNodeResult;
       }
 
+      if (targetSections !== location.sections) {
+        const movedSectionIds = collectTreeDescendantIds({
+          node: sectionNodeResult.node,
+        });
+
+        for (const movedSectionId of movedSectionIds) {
+          targetSections.items[movedSectionId] =
+            location.sections.items[movedSectionId];
+          delete location.sections.items[movedSectionId];
+        }
+      }
+
       insertTreeNode({
-        tree: location.sections.tree,
+        tree: targetSections.tree,
         node: sectionNodeResult.node,
         parentId: payload.parentId ?? null,
         index: payload.index,