Skip to content
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
27 changes: 9 additions & 18 deletions playbook/app/pb_kits/playbook/pb_dropdown/_dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ type DropdownProps = {
isClosed?: boolean;
label?: string;
multiSelect?: boolean;
name?: string;
onChange?: (event: { target: { name?: string; value: any } }) => void;
onSelect?: (arg: GenericObject) => null;
options?: GenericObject;
placeholder?: string;
Expand Down Expand Up @@ -158,8 +156,6 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
label,
multiSelect = false,
formPillProps,
name,
onChange,
onSelect,
options,
placeholder,
Expand Down Expand Up @@ -418,10 +414,6 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
setIsDropDownClosed(false);
};

const handleSelectionChange = (value: any) => {
onSelect && onSelect(value);
onChange && onChange({ target: { name, value } });
};

const handleOptionClick = (clickedItem: GenericObject) => {
if (disabled) return;
Expand All @@ -434,7 +426,7 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
const next = exists
? list.filter((option) => option.value !== clickedItem.value)
: [...list, clickedItem];
handleSelectionChange(next);
onSelect && onSelect(next);
return next;
});
setFilterItem("");
Expand All @@ -447,7 +439,7 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
if (shouldCloseOnClick) {
setIsDropDownClosed(true);
}
handleSelectionChange(clickedItem);
onSelect && onSelect(clickedItem);

// Sync with DatePickers if this is a quickpick variant
if (variant === "quickpick" && Array.isArray(clickedItem.value)) {
Expand Down Expand Up @@ -476,10 +468,10 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
if (disabled) return;
if (multiSelect) {
setSelected([]);
handleSelectionChange([]);
onSelect && onSelect([]);
} else {
setSelected({});
handleSelectionChange(null);
onSelect && onSelect(null);
setFocusedOptionIndex(-1);
setFilterItem("");

Expand Down Expand Up @@ -513,10 +505,10 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
clearSelected: () => {
if (multiSelect) {
setSelected([]);
handleSelectionChange([]);
onSelect && onSelect([]);
} else {
setSelected({});
handleSelectionChange(null);
onSelect && onSelect(null);
}
setFilterItem("");
setIsDropDownClosed(true);
Expand All @@ -530,16 +522,16 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
clearSelected: () => {
if (multiSelect) {
setSelected([]);
handleSelectionChange([]);
onSelect && onSelect([]);
} else {
setSelected({});
handleSelectionChange(null);
onSelect && onSelect(null);
}
setFilterItem("");
setIsDropDownClosed(true);
},
};
}, [multiSelect, handleSelectionChange, setSelected, setFilterItem, setIsDropDownClosed]);
}, [multiSelect, onSelect, setSelected, setFilterItem, setIsDropDownClosed]);

useImperativeHandle(ref, () => imperativeRef.current);

Expand Down Expand Up @@ -602,7 +594,6 @@ let Dropdown = (props: DropdownProps, ref: any): React.ReactElement | null => {
handleBackspace,
handleChange,
handleOptionClick,
handleSelectionChange,
handleWrapperClick,
inputRef,
inputWrapperRef,
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
"name": "Content",
"props": [
"label",
"name",
"placeholder",
"options",
"defaultValue",
Expand Down Expand Up @@ -131,7 +130,6 @@
{
"name": "Events",
"props": [
"onChange",
"onSelect"
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
"name": "Content",
"props": [
"label",
"name",
"placeholder",
"options",
"defaultValue",
Expand Down Expand Up @@ -112,7 +111,7 @@
},
{
"name": "Events",
"props": ["onChange", "onSelect"]
"props": ["onSelect"]
}
],
"presets": [
Expand Down
6 changes: 0 additions & 6 deletions playbook/app/pb_kits/playbook/pb_dropdown/docs/example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ examples:
- dropdown_disabled: Disabled Input
- dropdown_grouped_options: Grouped Options
- dropdown_custom_event_type: Custom Event Type
- dropdown_dynamic_options: Dynamic Options
- dropdown_dynamic_options_with_autocomplete: Dynamic Options with Autocomplete
- dropdown_dynamic_options_with_multi_select: Dynamic Options with Multi Select

react:
- dropdown_default: Default
Expand Down Expand Up @@ -84,6 +81,3 @@ examples:
- dropdown_required_indicator: Required Indicator
- dropdown_disabled: Disabled Input
- dropdown_grouped_options: Grouped Options
- dropdown_react_hook: React Hook
- dropdown_multi_select_react_hook: React Hook Multi Select

2 changes: 0 additions & 2 deletions playbook/app/pb_kits/playbook/pb_dropdown/docs/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
export { default as DropdownDefault } from './_dropdown_default.jsx'
export { default as DropdownReactHook } from './_dropdown_react_hook.jsx'
export { default as DropdownMultiSelectReactHook } from './_dropdown_multi_select_react_hook.jsx'
export { default as DropdownWithCustomDisplay } from './_dropdown_with_custom_display.jsx'
export { default as DropdownWithCustomOptions } from './_dropdown_with_custom_options.jsx'
export { default as DropdownWithCustomTrigger } from './_dropdown_with_custom_trigger.jsx'
Expand Down
14 changes: 1 addition & 13 deletions playbook/app/pb_kits/playbook/pb_dropdown/dropdown.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,6 @@ class Dropdown < Playbook::KitBase
default: false
prop :custom_event_type, type: Playbook::Props::String,
default: ""
prop :options_by_context, type: Playbook::Props::HashProp,
default: {}
prop :context_selector, type: Playbook::Props::String,
default: ""
prop :clear_on_context_change, type: Playbook::Props::Boolean,
default: true
prop :options_event_type, type: Playbook::Props::String,
default: ""

def data
Hash(prop(:data)).merge(
Expand All @@ -81,11 +73,7 @@ def data
end_date_id: variant == "quickpick" ? end_date_id : nil,
controls_start_id: variant == "quickpick" && controls_start_id.present? ? controls_start_id : nil,
controls_end_id: variant == "quickpick" && controls_end_id.present? ? controls_end_id : nil,
custom_event_type: custom_event_type.presence,
pb_dropdown_options_by_context: options_by_context.present? ? options_by_context.to_json : nil,
pb_dropdown_context_selector: context_selector.presence,
pb_dropdown_clear_on_context_change: clear_on_context_change,
options_event_type: options_event_type.presence
custom_event_type: custom_event_type.presence
).compact
end

Expand Down
Loading
Loading