Skip to content

Rework dropdown changes #1964

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
jacogr merged 2 commits into from
Nov 30, 2019
Merged

Rework dropdown changes #1964

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
590581d
Rework dropdown changes
jacogr Nov 30, 2019
3459b6d
Merge branch 'master' into jg-dropdown
jacogr Nov 30, 2019
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
42 changes: 22 additions & 20 deletions packages/react-components/src/Dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import { BareProps } from './types';

import React, { useEffect, useState } from 'react';
import React, { useEffect, useRef, useState } from 'react';
import styled from 'styled-components';
import SUIButton from 'semantic-ui-react/dist/commonjs/elements/Button/Button';
import SUIDropdown, { DropdownProps } from 'semantic-ui-react/dist/commonjs/modules/Dropdown/Dropdown';
Expand Down Expand Up @@ -40,31 +40,33 @@ interface Props<Option> extends BareProps {
}

function Dropdown<Option> ({ allowAdd = false, className, defaultValue, dropdownClassName, help, isButton, isDisabled, isError, isMultiple, label, labelExtra, onAdd, onBlur, onChange, onClose, onSearch, options, placeholder, renderLabel, searchInput, style, transform, withEllipsis, withLabel, value }: Props<Option>): React.ReactElement<Props<Option>> {
const [stateValue, setStateValue] = useState<any>();
const lastUpdate = useRef<string>('');
const [stored, setStored] = useState<any>();

const _onAdd = (_: React.SyntheticEvent<HTMLElement>, { value }: DropdownProps): void =>
onAdd && onAdd(value);
const _setStored = (value: any): void => {
const json = JSON.stringify({ v: value });

const _onChange = (_: React.SyntheticEvent<HTMLElement> | null, { value }: DropdownProps): void => {
setStateValue(value);
if (lastUpdate.current !== json) {
lastUpdate.current = json;

onChange && onChange(
transform
? transform(value)
: value
);
setStored(value);
onChange && onChange(
transform
? transform(value)
: value
);
}
};

useEffect((): void => {
const newValue = isUndefined(value)
? defaultValue
: value;
_setStored(isUndefined(value) ? defaultValue : value);
}, [defaultValue, value]);

// only update parent if we have had something changed
if (JSON.stringify({ v: newValue }) !== JSON.stringify({ v: stateValue })) {
_onChange(null, { value: newValue });
}
}, [defaultValue, stateValue, value]);
const _onAdd = (_: React.SyntheticEvent<HTMLElement>, { value }: DropdownProps): void =>
onAdd && onAdd(value);

const _onChange = (_: React.SyntheticEvent<HTMLElement> | null, { value }: DropdownProps): void =>
_setStored(value);

const dropdown = (
<SUIDropdown
Expand All @@ -86,7 +88,7 @@ function Dropdown<Option> ({ allowAdd = false, className, defaultValue, dropdown
search={onSearch || allowAdd}
searchInput={searchInput}
selection
value={stateValue}
value={stored}
/>
);

Expand Down