-
-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #630 from tuanchauict/appearance-js
Link appearance's fill + border + stroke with UI interaction
- Loading branch information
Showing
15 changed files
with
311 additions
and
210 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 54 additions & 22 deletions
76
monosketch-svelte/src/lib/ui/pannel/shapetool/appearance/BorderTool.svelte
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,61 @@ | ||
| <script lang="ts"> | ||
| import CommonBorderTool from './common/CommonBorderTool.svelte'; | ||
| import CommonBorderTool from './common/CommonBorderTool.svelte'; | ||
| import { getContext, onDestroy, onMount } from "svelte"; | ||
| import { ShapeToolViewModel } from "$ui/pannel/shapetool/viewmodel/shape-tool-viewmodel"; | ||
| import { SHAPE_TOOL_VIEWMODEL } from "$ui/pannel/shapetool/constants"; | ||
| import { LifecycleOwner } from "$libs/flow"; | ||
| import type { StrokeDashPattern } from "$ui/pannel/shapetool/viewmodel/models"; | ||
| import { OneTimeAction } from "$mono/action-manager/one-time-actions"; | ||
| let selectedId = 'B1'; | ||
| let cornerRounded = false; | ||
| let viewModel = getContext<ShapeToolViewModel>(SHAPE_TOOL_VIEWMODEL); | ||
| let lifecycleOwner = new LifecycleOwner(); | ||
| let dashDash = 1; | ||
| let dashGap = 0; | ||
| let dashShift = 0; | ||
| let selectedStrokeItem = viewModel.shapeBorderTypeFlow.value; | ||
| let cornerRounded = viewModel.shapeBorderRoundedCornerFlow.value; | ||
| function onItemSelect(id: string) { | ||
| selectedId = id; | ||
| } | ||
| let dashPattern: StrokeDashPattern | null | undefined = viewModel.shapeBorderDashTypeFlow.value; | ||
| function onCornerRoundedChange(value: boolean) { | ||
| cornerRounded = value; | ||
| } | ||
| function onItemSelect(id: string | null) { | ||
| viewModel.update(OneTimeAction.ChangeShapeBorderExtra({ newBorderStyleId: id, isEnabled: id !== null })); | ||
| } | ||
| function onCornerRoundedChange(value: boolean) { | ||
| viewModel.update(OneTimeAction.ChangeShapeBorderCornerExtra(value)); | ||
| } | ||
| function onDashPatternChange(dashPattern: StrokeDashPattern) { | ||
| viewModel.update(OneTimeAction.ChangeShapeBorderDashPatternExtra(dashPattern)); | ||
| } | ||
| onMount(() => { | ||
| lifecycleOwner.onStart(); | ||
| viewModel.shapeBorderTypeFlow.observe(lifecycleOwner, (value) => { | ||
| selectedStrokeItem = value; | ||
| }); | ||
| viewModel.shapeBorderRoundedCornerFlow.observe(lifecycleOwner, (value) => { | ||
| cornerRounded = value; | ||
| }); | ||
| viewModel.shapeBorderDashTypeFlow.observe(lifecycleOwner, (value) => { | ||
| dashPattern = value; | ||
| }); | ||
| }); | ||
| onDestroy(() => { | ||
| lifecycleOwner.onStop(); | ||
| }); | ||
| </script> | ||
|
|
||
| <CommonBorderTool | ||
| title="Border" | ||
| {onItemSelect} | ||
| {selectedId} | ||
| {cornerRounded} | ||
| onCornerRounded="{onCornerRoundedChange}" | ||
| bind:dashDash | ||
| bind:dashGap | ||
| bind:dashShift | ||
| /> | ||
| {#if selectedStrokeItem && cornerRounded !== undefined && dashPattern !== undefined} | ||
| <CommonBorderTool | ||
| title="Border" | ||
| {onItemSelect} | ||
| selectedId="{selectedStrokeItem.selectedId}" | ||
| {cornerRounded} | ||
| onCornerRounded="{onCornerRoundedChange}" | ||
| {dashPattern} | ||
| {onDashPatternChange} | ||
| /> | ||
| {/if} |
78 changes: 51 additions & 27 deletions
78
monosketch-svelte/src/lib/ui/pannel/shapetool/appearance/FillTool.svelte
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,60 @@ | ||
| <script lang="ts"> | ||
| import Tool from './common/Tool.svelte'; | ||
| import CloudItem from './common/CloudItem.svelte'; | ||
| import type { ShapeToolViewModel } from "$ui/pannel/shapetool/viewmodel/shape-tool-viewmodel"; | ||
| import { getContext } from "svelte"; | ||
| import { SHAPE_TOOL_VIEWMODEL } from "$ui/pannel/shapetool/constants"; | ||
| import Tool from './common/Tool.svelte'; | ||
| import CloudItem from './common/CloudItem.svelte'; | ||
| import type { ShapeToolViewModel } from "$ui/pannel/shapetool/viewmodel/shape-tool-viewmodel"; | ||
| import { getContext, onDestroy, onMount } from "svelte"; | ||
| import { SHAPE_TOOL_VIEWMODEL } from "$ui/pannel/shapetool/constants"; | ||
| import { LifecycleOwner } from "$libs/flow"; | ||
| import { OneTimeAction } from "$mono/action-manager/one-time-actions"; | ||
| import type { CloudItemSelectionState } from "$ui/pannel/shapetool/viewmodel/models"; | ||
| let viewModel = getContext<ShapeToolViewModel>(SHAPE_TOOL_VIEWMODEL); | ||
| let viewModel = getContext<ShapeToolViewModel>(SHAPE_TOOL_VIEWMODEL); | ||
| let lifecycleOwner = new LifecycleOwner(); | ||
| let selectedId = 'F0'; | ||
| let shapeFillToolSelectionState: CloudItemSelectionState | null | undefined = viewModel.shapeFillTypeFlow.value; | ||
| function onItemSelect(id: string) { | ||
| selectedId = id; | ||
| } | ||
| </script> | ||
| onMount(() => { | ||
| lifecycleOwner.onStart(); | ||
| viewModel.shapeFillTypeFlow.observe(lifecycleOwner, (value) => { | ||
| shapeFillToolSelectionState = value; | ||
| }); | ||
| }); | ||
| onDestroy(() => { | ||
| lifecycleOwner.onStop(); | ||
| }); | ||
| <Tool title="Fill" available="{true}"> | ||
| <div> | ||
| {#each viewModel.fillOptions as option} | ||
| function onItemSelect(id: string | null) { | ||
| viewModel.update(OneTimeAction.ChangeShapeFillExtra({ isEnabled: id !== null, newFillStyleId: id })); | ||
| } | ||
| </script> | ||
| {#if shapeFillToolSelectionState} | ||
| <Tool title="Fill" available="{true}"> | ||
| <div> | ||
| <!-- Disable-item --> | ||
| <CloudItem | ||
| id="{option.id}" | ||
| selected="{option.id === selectedId}" | ||
| useDashBorder="{option.useDashBorder}" | ||
| onSelect="{onItemSelect}">{option.name}</CloudItem | ||
| > | ||
| {/each} | ||
| </div> | ||
| </Tool> | ||
| id="{null}" | ||
| selected="{shapeFillToolSelectionState.selectedId === null}" | ||
| useDashBorder="{true}" | ||
| onSelect="{onItemSelect}">× | ||
| </CloudItem> | ||
|
|
||
| {#each viewModel.fillOptions as option} | ||
| <CloudItem | ||
| id="{option.id}" | ||
| selected="{option.id === shapeFillToolSelectionState.selectedId}" | ||
| onSelect="{onItemSelect}">{option.name}</CloudItem | ||
| > | ||
| {/each} | ||
| </div> | ||
| </Tool> | ||
| {/if} | ||
|
|
||
| <style lang="scss"> | ||
| div { | ||
| display: flex; | ||
| flex-wrap: wrap; | ||
| gap: 7px; | ||
| } | ||
| div { | ||
| display: flex; | ||
| flex-wrap: wrap; | ||
| gap: 7px; | ||
| } | ||
| </style> |
77 changes: 54 additions & 23 deletions
77
monosketch-svelte/src/lib/ui/pannel/shapetool/appearance/StrokeTool.svelte
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,60 @@ | ||
| <script lang="ts"> | ||
| import CommonBorderTool from './common/CommonBorderTool.svelte'; | ||
| import CommonBorderTool from './common/CommonBorderTool.svelte'; | ||
| import { SHAPE_TOOL_VIEWMODEL } from "$ui/pannel/shapetool/constants"; | ||
| import { getContext, onDestroy, onMount } from "svelte"; | ||
| import { ShapeToolViewModel } from "$ui/pannel/shapetool/viewmodel/shape-tool-viewmodel"; | ||
| import { LifecycleOwner } from "$libs/flow"; | ||
| import { OneTimeAction } from "$mono/action-manager/one-time-actions"; | ||
| import type { StrokeDashPattern } from "$ui/pannel/shapetool/viewmodel/models"; | ||
| let selectedId = 'B1'; | ||
| let cornerRounded = false; | ||
| let viewModel = getContext<ShapeToolViewModel>(SHAPE_TOOL_VIEWMODEL); | ||
| let lifecycleOwner = new LifecycleOwner(); | ||
| let dashDash = 1; | ||
| let dashGap = 0; | ||
| let dashShift = 0; | ||
| let selectedStrokeItem = viewModel.lineStrokeTypeFlow.value; | ||
| let cornerRounded = viewModel.lineStrokeRoundedCornerFlow.value; | ||
| function onItemSelect(id: string) { | ||
| selectedId = id; | ||
| } | ||
| let dashPattern: StrokeDashPattern | null | undefined = viewModel.lineStrokeDashTypeFlow.value; | ||
| function onCornerRoundedChange(value: boolean) { | ||
| cornerRounded = value; | ||
| } | ||
| </script> | ||
| function onItemSelect(id: string | null) { | ||
| viewModel.update(OneTimeAction.ChangeLineStrokeExtra({ newStrokeStyleId: id, isEnabled: id !== null })); | ||
| } | ||
| function onCornerRoundedChange(value: boolean) { | ||
| viewModel.update(OneTimeAction.ChangeLineStrokeCornerExtra(value)); | ||
| } | ||
| function onDashPatternChange(dashPattern: StrokeDashPattern) { | ||
| viewModel.update(OneTimeAction.ChangeLineStrokeDashPatternExtra(dashPattern)); | ||
| } | ||
| onMount(() => { | ||
| lifecycleOwner.onStart(); | ||
| <CommonBorderTool | ||
| title="Stroke" | ||
| {onItemSelect} | ||
| {selectedId} | ||
| {cornerRounded} | ||
| onCornerRounded="{onCornerRoundedChange}" | ||
| bind:dashDash | ||
| bind:dashGap | ||
| bind:dashShift | ||
| /> | ||
| viewModel.lineStrokeTypeFlow.observe(lifecycleOwner, (value) => { | ||
| selectedStrokeItem = value; | ||
| }); | ||
| viewModel.lineStrokeRoundedCornerFlow.observe(lifecycleOwner, (value) => { | ||
| cornerRounded = value; | ||
| }); | ||
| viewModel.lineStrokeDashTypeFlow.observe(lifecycleOwner, (value) => { | ||
| dashPattern = value; | ||
| }); | ||
| }); | ||
| onDestroy(() => { | ||
| lifecycleOwner.onStop(); | ||
| }); | ||
| </script> | ||
| {#if selectedStrokeItem && cornerRounded !== undefined && dashPattern !== undefined} | ||
| <CommonBorderTool | ||
| title="Stroke" | ||
| {onItemSelect} | ||
| selectedId="{selectedStrokeItem.selectedId}" | ||
| {cornerRounded} | ||
| onCornerRounded="{onCornerRoundedChange}" | ||
| {dashPattern} | ||
| {onDashPatternChange} | ||
| /> | ||
| {/if} |
Oops, something went wrong.