Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "feat(search-input): 選択した要素のアイテムの親階層がわかるようにする" #1333

Merged
merged 1 commit into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .changeset/itchy-carrots-design.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@
<div v-for="item in checkValues" :key="item">
<span :class="styles.searchInputInnerBoxSelectedItemStyle">
<span :class="styles.searchInputInnerBoxSelectedLabelStyle">
{{
valueToOption.get(item)?.selectedItemLabel
? valueToOption.get(item)?.selectedItemLabel
: valueToOption.get(item)?.label
}}
{{ valueToOption.get(item)?.label }}
</span>
<button
type="button"
Expand Down Expand Up @@ -293,15 +289,10 @@ const valueToOption = computed(() => {

const flatten = (options: SearchInputOption[]): SearchInputOption[] => {
return options.flatMap((option) => {
if (!option.children) return [option];

const children = option.children.map((child) => ({
...child,
// 要件上、全角空白のため無視
// eslint-disable-next-line no-irregular-whitespace
label: `${option.label} ${child.label}`,
}));
return [option, ...flatten(children)];
if (option.children) {
return [option, ...flatten(option.children)];
}
return [option];
});
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ export const defaultOption: SearchInputOption[] = [
{
label: "保険商品1",
value: 2,
selectedItemLabel: "保険商品1 / プランA",
},
{
label: "保険商品2",
Expand Down Expand Up @@ -472,7 +471,6 @@ export const simpleOption: SearchInputOption[] = [
{
label: "選択肢3",
value: 3,
selectedItemLabel: "選択肢3 / サンプル",
},
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const Template =
(args) => ({
components: { WizSearchInput },
setup() {
const values = ref<number[]>(args.modelValue ? args.modelValue : []);
const values = ref<number[]>([]);
const openPopup = ref(open);
const toggle = (value: boolean) => {
openPopup.value = value;
Expand Down Expand Up @@ -177,13 +177,3 @@ ShowSelectedItemTag.args = {
options: simpleOption,
showSelectedItem: true,
};

export const SelectedItemLabel = Template(true).bind({});
SelectedItemLabel.args = {
placeholder: "氏名・ID・電話番号で検索",
singleSelect: true,
inputWidth: "15rem",
options: simpleOption,
showSelectedItem: true,
modelValue: [3],
};
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ export type Tag = {
export type SearchInputOption = {
label: string;
value: number;
selectedItemLabel?: string;
children?: SearchInputOption[];
tag?: Tag;
};
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,10 @@ const SearchInput: FC<Props> = ({

const flatten = (options: SearchInputOption[]): SearchInputOption[] => {
return options.flatMap((option) => {
if (!option.children) return [option];

const children = option.children.map((child) => ({
...child,
// 要件上、全角空白のため無視
// eslint-disable-next-line no-irregular-whitespace
label: `${option.label} ${child.label}`,
}));
return [option, ...flatten(children)];
if (option.children) {
return [option, ...flatten(option.children)];
}
return [option];
});
};

Expand Down Expand Up @@ -148,9 +143,7 @@ const SearchInput: FC<Props> = ({
<span
className={styles.searchInputInnerBoxSelectedLabelStyle}
>
{valueToOptions.get(value)?.selectedItemLabel
? valueToOptions.get(value)?.selectedItemLabel
: valueToOptions.get(value)?.label}
{valueToOptions.get(value)?.label}
</span>
<button
type="button"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ export type Tag = {
export type SearchInputOption = {
label: string;
value: number;
selectedItemLabel?: string;
children?: SearchInputOption[];
tag?: Tag;
};
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export const normalOptions: SearchInputOption[] = [
{
label: "保険商品1",
value: 2,
selectedItemLabel: "保険商品1 / プランA",
},
{
label: "保険商品2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ type Story = StoryObj<typeof WizSearchInput>;

const Template: Story = {
render: (args) => {
const [values, setValues] = useState<number[]>(
args.values ? args.values : []
);
const [values, setValues] = useState<number[]>([]);
return (
<div>
<div>values:[{values.join(", ")}]</div>
Expand Down Expand Up @@ -158,15 +156,3 @@ export const ShowSelectedItemTag: Story = {
showSelectedItem: true,
},
};

export const SelectedItemLabel: Story = {
...Template,
args: {
options: normalOptions,
placeholder: "氏名・ID・電話番号で検索",
singleSelect: true,
inputWidth: "15rem",
showSelectedItem: true,
values: [2],
},
};
Loading