From 696bc5ed765b90429be3fcfcf6eb90f253fb2212 Mon Sep 17 00:00:00 2001 From: okakyo <0622okakyo@gmail.com> Date: Sat, 3 Feb 2024 15:07:01 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[#1203]=20options=20=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=84=E9=81=B8=E6=8A=9E=E8=82=A2=E3=82=92=E9=81=B8=E6=8A=9E?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=81=A8=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C?= =?UTF-8?q?=E5=87=BA=E3=82=8B=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/inputs/search-selector/search-selector.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.vue b/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.vue index 7a6a8991c..f5c46a6a1 100644 --- a/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.vue +++ b/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.vue @@ -255,7 +255,11 @@ const valueToOption = computed(() => ); const selectedItem = computed(() => { - return props.modelValue.map((v) => valueToOption.value[v]); + // props.options.values の値の配列 + const values = props.options.map((v) => v.value); + return props.modelValue + .filter((v) => values.includes(v)) + .map((v) => valueToOption.value[v]); }); const setUnselectableRef = From 3077bfb847452ee1e1976871c18240d1bd6a18e0 Mon Sep 17 00:00:00 2001 From: okakyo <0622okakyo@gmail.com> Date: Sat, 3 Feb 2024 15:20:51 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[#1203]=20selectedItems=20=E3=81=8C=200=20?= =?UTF-8?q?=E3=81=AE=E5=A0=B4=E5=90=88=E3=81=A7=E3=82=82=20Input=20?= =?UTF-8?q?=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/inputs/search-selector/search-selector.vue | 4 +++- .../inputs/search-selector/components/search-selector.tsx | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.vue b/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.vue index f5c46a6a1..74d27d5af 100644 --- a/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.vue +++ b/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.vue @@ -38,7 +38,9 @@ = ({ ))} - {(multiSelectable || values.length === 0) && ( + {(multiSelectable || + values.length === 0 || + selectedOptions.length === 0) && ( Date: Sat, 3 Feb 2024 15:21:54 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[#1203]=20=E5=AD=98=E5=9C=A8=E3=81=97?= =?UTF-8?q?=E3=81=AA=E3=81=84=E9=81=B8=E6=8A=9E=E8=82=A2=E3=82=92=E9=81=B8?= =?UTF-8?q?=E3=82=93=E3=81=A0=E5=A0=B4=E5=90=88=E3=81=AE=20Storybook=20?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search-selector.stories.ts | 19 +++++++++++++++++++ .../stories/search-selector.stories.tsx | 7 +++++++ 2 files changed, 26 insertions(+) diff --git a/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.stories.ts b/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.stories.ts index 5ae77caf1..f50ab80e2 100644 --- a/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.stories.ts +++ b/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.stories.ts @@ -270,6 +270,25 @@ Selecting.parameters = { }, }; +export const NotExistOptionSelected = Template( + [-1], + false, + _getDummyOptions("test", 3), + "" +).bind({}); +NotExistOptionSelected.args = { + multiSelectable: false, +}; +NotExistOptionSelected.parameters = { + docs: { + source: { + code: code([-1], false, _getDummyOptions("test", 3), "", { + multiSelectable: false, + }), + }, + }, +}; + export const MultiSelecting = Template( [1, 2, 3], false, diff --git a/packages/wiz-ui-react/src/components/base/inputs/search-selector/stories/search-selector.stories.tsx b/packages/wiz-ui-react/src/components/base/inputs/search-selector/stories/search-selector.stories.tsx index 8ee3f6fd4..b703bfa3e 100644 --- a/packages/wiz-ui-react/src/components/base/inputs/search-selector/stories/search-selector.stories.tsx +++ b/packages/wiz-ui-react/src/components/base/inputs/search-selector/stories/search-selector.stories.tsx @@ -98,6 +98,13 @@ export const Selecting: Story = { }, }; +export const NotExistOptionSelected: Story = { + ...getTemplate([-1]), + args: { + options: getDummyOptions("test", 3), + }, +}; + export const MultiSelecting: Story = { ...getTemplate([1, 2, 3]), args: { From 05d2cc370149caba537d2a87163d8198e9f192dd Mon Sep 17 00:00:00 2001 From: ichi-h <85932406+ichi-h@users.noreply.github.com> Date: Mon, 5 Feb 2024 14:03:16 +0900 Subject: [PATCH 4/5] =?UTF-8?q?docs(search-selector):=20=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E3=81=AAstory=E3=81=AE=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search-selector.stories.ts | 19 ------------------- .../stories/search-selector.stories.tsx | 7 ------- 2 files changed, 26 deletions(-) diff --git a/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.stories.ts b/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.stories.ts index f50ab80e2..5ae77caf1 100644 --- a/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.stories.ts +++ b/packages/wiz-ui-next/src/components/base/inputs/search-selector/search-selector.stories.ts @@ -270,25 +270,6 @@ Selecting.parameters = { }, }; -export const NotExistOptionSelected = Template( - [-1], - false, - _getDummyOptions("test", 3), - "" -).bind({}); -NotExistOptionSelected.args = { - multiSelectable: false, -}; -NotExistOptionSelected.parameters = { - docs: { - source: { - code: code([-1], false, _getDummyOptions("test", 3), "", { - multiSelectable: false, - }), - }, - }, -}; - export const MultiSelecting = Template( [1, 2, 3], false, diff --git a/packages/wiz-ui-react/src/components/base/inputs/search-selector/stories/search-selector.stories.tsx b/packages/wiz-ui-react/src/components/base/inputs/search-selector/stories/search-selector.stories.tsx index b703bfa3e..8ee3f6fd4 100644 --- a/packages/wiz-ui-react/src/components/base/inputs/search-selector/stories/search-selector.stories.tsx +++ b/packages/wiz-ui-react/src/components/base/inputs/search-selector/stories/search-selector.stories.tsx @@ -98,13 +98,6 @@ export const Selecting: Story = { }, }; -export const NotExistOptionSelected: Story = { - ...getTemplate([-1]), - args: { - options: getDummyOptions("test", 3), - }, -}; - export const MultiSelecting: Story = { ...getTemplate([1, 2, 3]), args: { From 30ce4029395fda0b239ccbe8c3f96210d81931dc Mon Sep 17 00:00:00 2001 From: ichi-h <85932406+ichi-h@users.noreply.github.com> Date: Mon, 5 Feb 2024 14:05:06 +0900 Subject: [PATCH 5/5] chore(search-selector): changeset --- .changeset/breezy-deers-poke.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/breezy-deers-poke.md diff --git a/.changeset/breezy-deers-poke.md b/.changeset/breezy-deers-poke.md new file mode 100644 index 000000000..127a9f8fe --- /dev/null +++ b/.changeset/breezy-deers-poke.md @@ -0,0 +1,6 @@ +--- +"@wizleap-inc/wiz-ui-react": patch +"@wizleap-inc/wiz-ui-next": patch +--- + +fix(search-selector): options に存在しない modelValue/values を突っ込むと動かなくなる/UI がバグる箇所の修正