Fix error

tuanchauict · Dec 17, 2024 · db4c3cb · db4c3cb
1 parent d003a25
commit db4c3cb
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 13 deletions.
diff --git a/monosketch-svelte/src/lib/mono/shape/extra/extra-manager.ts b/monosketch-svelte/src/lib/mono/shape/extra/extra-manager.ts
@@ -130,7 +130,7 @@ class ShapeExtraManagerImpl {
             textVerticalAlign ?? this.defaultTextAlign.verticalAlign,
         );
 
-        this.defaultExtraStateUpdateMutableFlow.value = this.defaultExtraStateUpdateFlow.value!! + 1;
+        this.defaultExtraStateUpdateMutableFlow.value = this.defaultExtraStateUpdateFlow.value! + 1;
     }
 
     getRectangleFillStyle(

diff --git a/monosketch-svelte/src/lib/ui/pannel/shapetool/appearance/BorderTool.svelte b/monosketch-svelte/src/lib/ui/pannel/shapetool/appearance/BorderTool.svelte
@@ -16,7 +16,7 @@
     let dashPattern: StrokeDashPattern | null | undefined = viewModel.shapeBorderDashTypeFlow.value;
 
     function onItemSelect(id: string | null) {
-        viewModel.update(OneTimeAction.ChangeShapeBorderExtra({newBorderStyleId: id, isEnabled: id !== null}));
+        viewModel.update(OneTimeAction.ChangeShapeBorderExtra({ newBorderStyleId: id, isEnabled: id !== null }));
     }
 
     function onCornerRoundedChange(value: boolean) {
@@ -58,4 +58,4 @@
             {dashPattern}
             {onDashPatternChange}
     />
-{/if}
+{/if}
diff --git a/monosketch-svelte/src/lib/ui/pannel/shapetool/appearance/FillTool.svelte b/monosketch-svelte/src/lib/ui/pannel/shapetool/appearance/FillTool.svelte
@@ -26,7 +26,7 @@
     });
 
     function onItemSelect(id: string | null) {
-        viewModel.update(OneTimeAction.ChangeShapeFillExtra({isEnabled: id !== null, newFillStyleId: id}));
+        viewModel.update(OneTimeAction.ChangeShapeFillExtra({ isEnabled: id !== null, newFillStyleId: id }));
     }
 </script>
 {#if shapeFillToolSelectionState}

diff --git a/monosketch-svelte/src/lib/ui/pannel/shapetool/appearance/StrokeTool.svelte b/monosketch-svelte/src/lib/ui/pannel/shapetool/appearance/StrokeTool.svelte
@@ -16,7 +16,7 @@
     let dashPattern: StrokeDashPattern | null | undefined = viewModel.lineStrokeDashTypeFlow.value;
 
     function onItemSelect(id: string | null) {
-        viewModel.update(OneTimeAction.ChangeLineStrokeExtra({newStrokeStyleId: id, isEnabled: id !== null}));
+        viewModel.update(OneTimeAction.ChangeLineStrokeExtra({ newStrokeStyleId: id, isEnabled: id !== null }));
     }
 
     function onCornerRoundedChange(value: boolean) {
@@ -57,4 +57,4 @@
             {dashPattern}
             {onDashPatternChange}
     />
-{/if}
+{/if}
diff --git a/monosketch-svelte/src/lib/ui/pannel/shapetool/appearance/common/CommonLineAnchorTool.svelte b/monosketch-svelte/src/lib/ui/pannel/shapetool/appearance/common/CommonLineAnchorTool.svelte
@@ -8,9 +8,9 @@ import { SHAPE_TOOL_VIEWMODEL } from "$ui/pannel/shapetool/constants";
 let viewModel: ShapeToolViewModel = getContext(SHAPE_TOOL_VIEWMODEL);
 
 export let title: string;
-export let selectedId: string;
+export let selectedId: string | null;
 
-function onItemSelect(id: string) {
+function onItemSelect(id: string | null) {
     selectedId = id;
 }
 </script>
@@ -21,7 +21,6 @@ function onItemSelect(id: string) {
             <CloudItem
                 id="{option.id}"
                 selected="{option.id === selectedId}"
-                useDashBorder="{option.useDashBorder}"
                 onSelect="{onItemSelect}">{option.name}</CloudItem
             >
         {/each}

diff --git a/monosketch-svelte/src/lib/ui/pannel/shapetool/appearance/common/DashPattern.svelte b/monosketch-svelte/src/lib/ui/pannel/shapetool/appearance/common/DashPattern.svelte
@@ -10,7 +10,7 @@
     let offset: number = dashPattern?.offset ?? 0;
 
     function onChangeInternal() {
-        onChange({dash, gap, offset})
+        onChange({ dash, gap, offset });
     }
 </script>
 

diff --git a/monosketch-svelte/src/lib/ui/pannel/shapetool/transform/TransformTool.svelte b/monosketch-svelte/src/lib/ui/pannel/shapetool/transform/TransformTool.svelte
@@ -5,6 +5,7 @@
     import { LifecycleOwner } from "$libs/flow";
     import { getContext, onDestroy, onMount } from "svelte";
     import { SHAPE_TOOL_VIEWMODEL } from "$ui/pannel/shapetool/constants";
+    import { OneTimeAction } from "$mono/action-manager/one-time-actions";
 
     let viewModel: ShapeToolViewModel = getContext(SHAPE_TOOL_VIEWMODEL);
 
@@ -16,7 +17,16 @@
     let width = 0;
     let isResizeable = viewModel.singleShapeResizeableFlow.value;
 
-    // TODO: Notify value changed to shape manager
+    function onChange() {
+        viewModel.update(
+            OneTimeAction.ChangeShapeBound({
+                newLeft: x,
+                newTop: y,
+                newWidth: width,
+                newHeight: height,
+            })
+        );
+    }
 
     onMount(() => {
         lifecycleOwner.onStart();
@@ -48,6 +58,7 @@
                     label="X"
                     bind:value="{x}"
                     boundIncludesLabel="{true}"
+                    {onChange}
             />
         </div>
         <div class="cell">
@@ -57,13 +68,15 @@
                     minValue="{1}"
                     boundIncludesLabel="{true}"
                     isEnabled="{isResizeable}"
+                    {onChange}
             />
         </div>
         <div class="cell">
             <NumberTextField
                     label="Y"
                     bind:value="{y}"
                     boundIncludesLabel="{true}"
+                    {onChange}
             />
         </div>
         <div class="cell">
@@ -73,6 +86,7 @@
                     minValue="{1}"
                     boundIncludesLabel="{true}"
                     isEnabled="{isResizeable}"
+                    {onChange}
             />
         </div>
     </div>

diff --git a/monosketch-svelte/src/lib/ui/pannel/shapetool/viewmodel/shape-tool-viewmodel.ts b/monosketch-svelte/src/lib/ui/pannel/shapetool/viewmodel/shape-tool-viewmodel.ts
@@ -14,7 +14,12 @@ import type { AbstractShape } from "$mono/shape/shape/abstract-shape";
 import { Rectangle } from "$mono/shape/shape/rectangle";
 import { Text } from "$mono/shape/shape/text";
 import { LineAppearanceDataController } from "./line-appearance-data-controller";
-import { type AppearanceOptionItem, type CloudItemSelectionState, type DashPattern, selectedOrDefault } from "./models";
+import {
+    type AppearanceOptionItem,
+    type CloudItemSelectionState,
+    selectedOrDefault,
+    type StrokeDashPattern,
+} from "./models";
 import { RectangleAppearanceDataController } from "./rectangle-appearance-data-controller";
 
 /**
@@ -37,7 +42,7 @@ export class ShapeToolViewModel {
     public readonly shapeBorderRoundedCornerFlow: Flow<boolean | null>;
 
     public readonly lineStrokeTypeFlow: Flow<CloudItemSelectionState | null>;
-    public readonly lineStrokeDashTypeFlow: Flow<DashPattern | null>;
+    public readonly lineStrokeDashTypeFlow: Flow<StrokeDashPattern | null>;
     public readonly lineStrokeRoundedCornerFlow: Flow<boolean | null>;
 
     public readonly lineStartHeadFlow: Flow<CloudItemSelectionState | null>;