Skip to content

Fix Select component's boundaries #18

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

Merged
merged 1 commit into from
Apr 22, 2019
Merged

Fix Select component's boundaries #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 35 additions & 29 deletions src/Lumi/Components/Select.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,34 +207,38 @@ select :: forall option. SelectProps option -> JSX
select = makeStateless component render
where
render props =
selectBackend
{ isOpen: Nothing
, loadOnMount: props.loadOnMount
, loadOptions: props.loadOptions
, optionSort: props.optionSort
, toSelectOption: props.toSelectOption
, allowMultiple: props.allowMultiple
, disabled: props.disabled
, onChange: props.onChange
, value: props.value
, render: \selectState ->
lumiSelectElement
{ "class": props.className
, "data-disabled": props.disabled
, "data-focus": selectState.isOpen
, "data-multi": props.allowMultiple
, style: props.style
, children:
[ renderInput props selectState
, if selectState.isOpen
then renderMenu props selectState
else empty
]
, onClick: Events.handler currentTarget \ct -> do
selectState.openSelect
traverse_ focusChildInput $ Node.fromEventTarget ct
, onFocus: Events.handler_ selectState.openSelect
}
lumiSelectElement
{ "class": props.className
, "data-disabled": props.disabled
, "data-multi": props.allowMultiple
, style: props.style
, children:
[ selectBackend
{ isOpen: Nothing
, loadOnMount: props.loadOnMount
, loadOptions: props.loadOptions
, optionSort: props.optionSort
, toSelectOption: props.toSelectOption
, allowMultiple: props.allowMultiple
, disabled: props.disabled
, onChange: props.onChange
, value: props.value
, render: \selectState ->
lumiSelectInnerElement
{ "data-focus": selectState.isOpen
, children:
[ renderInput props selectState
, if selectState.isOpen
then renderMenu props selectState
else empty
]
, onClick: Events.handler currentTarget \ct -> do
selectState.openSelect
traverse_ focusChildInput $ Node.fromEventTarget ct
, onFocus: Events.handler_ selectState.openSelect
}
}
]
}

renderInput props selectState =
Expand Down Expand Up @@ -344,6 +348,8 @@ select = makeStateless component render

lumiSelectElement =
element (R.unsafeCreateDOMComponent "lumi-select")
lumiSelectInnerElement =
element (R.unsafeCreateDOMComponent "lumi-select-inner")
lumiSelectInputElement =
element (R.unsafeCreateDOMComponent "lumi-select-input")
lumiSelectNativeInputElement =
Expand Down Expand Up @@ -402,7 +408,7 @@ styles = jss
}

, "&:hover lumi-select-input": lumiInputHoverStyles
, "&:focus lumi-select-input, &[data-focus=\"true\"] lumi-select-input": lumiInputFocusStyles
, "&:focus lumi-select-input, & lumi-select-inner[data-focus=\"true\"] lumi-select-input": lumiInputFocusStyles
, "&[data-disabled=\"true\"] lumi-select-input": lumiInputDisabledStyles

, "& lumi-select-input-selected-values":
Expand Down