Skip to content

Adding 'isOptionSelected' prop #70

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.

Sign up for GitHub

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

Open
neerava2023 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Adding 'isOptionSelected' prop #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d37a9bf
Adding 'isOptionSelected' prop
neerava2023 Nov 19, 2024
fed8b90
Delete package-lock.json
neerava2023 Nov 19, 2024
3b84671
Internally store options instead of actual value
NeeravaNraj Nov 19, 2024
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
22 changes: 18 additions & 4 deletions src/create-select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ interface CreateSelectProps {
multiple?: boolean;
disabled?: boolean;
optionToValue?: (option: CreateSelectOption) => CreateSelectSingleValue;
isOptionSelected?: (option: CreateSelectOption) => boolean;
isOptionDisabled?: (option: CreateSelectOption) => boolean;
onChange?: (value: CreateSelectValue) => void;
onInput?: (inputValue: string) => void;
Expand All @@ -33,14 +34,15 @@ const createSelect = (props: CreateSelectProps) => {
optionToValue: (option: CreateSelectOption): CreateSelectSingleValue =>
option,
isOptionDisabled: (option: CreateSelectOption) => false,
isOptionSelected: (option: CreateSelectOption) => false,
},
props,
);

const parseValue = (value: CreateSelectValue) => {
if (config.multiple && Array.isArray(value)) {
return value;
} else if (!config.multiple && !Array.isArray(value)) {
} else if (!config.multiple) {
return value !== null ? [value] : [];
} else {
throw new Error(
Expand All @@ -60,7 +62,7 @@ const createSelect = (props: CreateSelectProps) => {
const clearValue = () => _setValue([]);
const hasValue = () => !!(config.multiple ? value().length : value());

createEffect(on(_value, () => config.onChange?.(value()), { defer: true }));
// createEffect(on(_value, () => config.onChange?.(value()), { defer: true }));

const [inputValue, setInputValue] = createSignal("");
const clearInputValue = () => setInputValue("");
Expand Down Expand Up @@ -98,10 +100,12 @@ const createSelect = (props: CreateSelectProps) => {

const value = config.optionToValue(option);
if (config.multiple) {
setValue([..._value(), value]);
setValue([..._value(), option]);
props.onChange?.(_value().map(config.optionToValue));
} else {
setValue(value);
setValue(option);
setIsActive(false);
props.onChange?.(value);
}
setIsOpen(false);
};
Expand Down Expand Up @@ -134,6 +138,14 @@ const createSelect = (props: CreateSelectProps) => {
const focusPreviousOption = () => focusOption("previous");
const focusNextOption = () => focusOption("next");

const addSelectedOption = (option: CreateSelectOption) => {
if (config.multiple) {
_setValue([..._value(), option]);
} else {
_setValue(parseValue(option));
}
}

createEffect(
on(
options,
Expand Down Expand Up @@ -279,6 +291,8 @@ const createSelect = (props: CreateSelectProps) => {
pickOption,
isOptionFocused,
isOptionDisabled: config.isOptionDisabled,
isOptionSelected: config.isOptionSelected,
addSelectedOption,
onFocusIn,
onFocusOut,
onMouseDown,
Expand Down
20 changes: 20 additions & 0 deletions src/select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
useContext,
JSXElement,
Ref,
onMount,
} from "solid-js";
import {
createSelect,
Expand Down Expand Up @@ -65,6 +66,7 @@ const Select: Component<SelectProps> = (props) => {
"options",
"optionToValue",
"isOptionDisabled",
"isOptionSelected",
"multiple",
"disabled",
"onInput",
Expand Down Expand Up @@ -130,6 +132,14 @@ type ControlProps = Omit<CommonProps, "class">;
const Control: Component<ControlProps> = (props) => {
const select = useSelect();

createEffect(on(select.options, () => {
select.options().forEach((option: any) => {
if (select.isOptionSelected(option)) {
select.addSelectedOption(option);
}
});
}));

const removeValue = (index: number) => {
const value = select.value();
select.setValue([...value.slice(0, index), ...value.slice(index + 1)]);
Expand Down Expand Up @@ -252,6 +262,14 @@ type ListProps = Pick<
const List: Component<ListProps> = (props) => {
const select = useSelect();

const addSelectedOption = (option: CreateSelectOption) => {
if (select.multiple) {
select.setValue([...select.value(), option]);
} else {
select.setValue(option);
}
}

return (
<Show when={select.isOpen()}>
<div class="solid-select-list">
Expand Down Expand Up @@ -295,11 +313,13 @@ const Option: ParentComponent<OptionProps> = (props) => {
}
});
};

return (
<div
ref={scrollIntoViewOnFocus}
data-disabled={select.isOptionDisabled(props.option)}
data-focused={select.isOptionFocused(props.option)}
data-selected={select.isOptionSelected(props.option)}
class="solid-select-option"
onClick={() => select.pickOption(props.option)}
>
Expand Down