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.

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

EuiColorStops drag updates #2557

Merged
merged 6 commits into from
Jan 27, 2020
Merged

EuiColorStops drag updates #2557

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cf52261
useMemo; fewer arrow function prop values
thompsongl Nov 14, 2019
94c2254
Merge branch 'master' into 2498-drag-perf
thompsongl Nov 22, 2019
dbc0a6e
hooks updates
thompsongl Nov 22, 2019
51120df
Merge branch 'master' into 2498-drag-perf
thompsongl Jan 27, 2020
ac95074
CL
thompsongl Jan 27, 2020
546c436
Merge branch 'master' into 2498-drag-perf
thompsongl Jan 27, 2020
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
34 changes: 22 additions & 12 deletions src/components/color_picker/color_stops/color_stop_thumb.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,17 @@ export const EuiColorStopThumb: FunctionComponent<EuiColorStopThumbProps> = ({
}
};

const setHasFocusTrue = () => setHasFocus(true);
const setHasFocusFalse = () => setHasFocus(false);

const handleColorChange = (value: ColorStop['color']) => {
setColorIsInvalid(isColorInvalid(value));
onChange({ stop, color: value });
};

const handleColorInputChange = (e: React.ChangeEvent<HTMLInputElement>) =>
handleColorChange(e.target.value);

const handleStopChange = (value: ColorStop['stop']) => {
const willBeInvalid = value > localMax || value < localMin;

Expand All @@ -140,7 +146,9 @@ export const EuiColorStopThumb: FunctionComponent<EuiColorStopThumbProps> = ({
onChange({ stop: value, color });
};

const handleStopInputChange = (value: ColorStop['stop']) => {
const handleStopInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
let value = parseFloat(e.target.value);

const willBeInvalid = value > globalMax || value < globalMin;

if (willBeInvalid) {
Expand Down Expand Up @@ -200,10 +208,14 @@ export const EuiColorStopThumb: FunctionComponent<EuiColorStopThumbProps> = ({
openPopover();
};

const handleTouchStart = (e: React.TouchEvent<HTMLButtonElement>) => {
const handleTouchInteraction = (e: React.TouchEvent<HTMLButtonElement>) => {
if (!readOnly) {
handleInteraction(e);
}
};

const handleTouchStart = (e: React.TouchEvent<HTMLButtonElement>) => {
handleTouchInteraction(e);
openPopover();
};

Expand All @@ -215,6 +227,8 @@ export const EuiColorStopThumb: FunctionComponent<EuiColorStopThumbProps> = ({
className
);

// console.log('render', stop);

return (
<EuiPopover
ref={popoverRef}
Expand Down Expand Up @@ -252,13 +266,13 @@ export const EuiColorStopThumb: FunctionComponent<EuiColorStopThumbProps> = ({
max={localMax}
value={stop}
onFocus={handleFocus}
onBlur={() => setHasFocus(false)}
onMouseOver={() => setHasFocus(true)}
onMouseOut={() => setHasFocus(false)}
onBlur={setHasFocusFalse}
onMouseOver={setHasFocusTrue}
onMouseOut={setHasFocusFalse}
onKeyDown={handleKeyDown}
onMouseDown={handleOnMouseDown}
onTouchStart={handleTouchStart}
onTouchMove={readOnly ? undefined : handleInteraction}
onTouchMove={handleTouchInteraction}
aria-valuetext={ariaValueText}
aria-label={ariaLabel}
title={title}
Expand Down Expand Up @@ -307,9 +321,7 @@ export const EuiColorStopThumb: FunctionComponent<EuiColorStopThumbProps> = ({
max={isRangeMax || max == null ? null : localMax}
value={isStopInvalid(stop) ? '' : stop}
isInvalid={stopIsInvalid}
onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
handleStopInputChange(parseFloat(e.target.value))
}
onChange={handleStopInputChange}
/>
</EuiFormRow>
)}
Expand Down Expand Up @@ -370,9 +382,7 @@ export const EuiColorStopThumb: FunctionComponent<EuiColorStopThumbProps> = ({
readOnly={readOnly}
value={color}
isInvalid={colorIsInvalid}
onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
handleColorChange(e.target.value)
}
onChange={handleColorInputChange}
/>
</EuiFormRow>
)}
Expand Down
166 changes: 103 additions & 63 deletions src/components/color_picker/color_stops/color_stops.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,12 @@ export const EuiColorStops: FunctionComponent<EuiColorStopsProps> = ({
);
};

const handleOnChange = (colorStops: ColorStop[]) => {
onChange(colorStops, isInvalid(colorStops));
};

const handleStopChange = (stop: ColorStop, id: number) => {
const newColorStops = [...colorStops];
newColorStops.splice(id, 1, stop);
handleOnChange(newColorStops);
};
const handleOnChange = useCallback(
(colorStops: ColorStop[]) => {
onChange(colorStops, isInvalid(colorStops));
},
[onChange]
);

const onFocusStop = useCallback(
(index: number) => {
Expand Down Expand Up @@ -207,11 +204,21 @@ export const EuiColorStops: FunctionComponent<EuiColorStopsProps> = ({
}
}, [sortedStops, onFocusStop, setFocusStopOnUpdate, focusStopOnUpdate]);

const onFocusWrapper = () => {
const onFocusWrapper = useCallback(() => {
setFocusedStopIndex(null);
if (wrapperRef) {
wrapperRef.focus();
}
}, [wrapperRef]);

const setWrapperHasFocus = (e: React.FocusEvent) => {
if (e.target === wrapperRef) {
setHasFocus(true);
}
};

const removeWrapperFocus = () => {
setHasFocus(false);
};

const onAdd = () => {
Expand All @@ -227,11 +234,24 @@ export const EuiColorStops: FunctionComponent<EuiColorStopsProps> = ({
handleOnChange(newColorStops);
};

const onRemove = (index: number) => {
const newColorStops = removeStop(colorStops, index);
const onRemove = useCallback(
(index: number) => {
const newColorStops = removeStop(colorStops, index);

onFocusWrapper();
handleOnChange(newColorStops);
onFocusWrapper();
handleOnChange(newColorStops);
},
[colorStops, handleOnChange, onFocusWrapper]
);

const disableHover = () => {
if (disabled) return;
setIsHoverDisabled(true);
};

const enableHover = () => {
if (disabled) return;
setIsHoverDisabled(false);
};

const handleAddHover = (e: React.MouseEvent<HTMLDivElement>) => {
Expand Down Expand Up @@ -307,46 +327,70 @@ export const EuiColorStops: FunctionComponent<EuiColorStopsProps> = ({
}
};

const thumbs = sortedStops.map((colorStop, index) => (
<EuiColorStopThumb
isRangeMin={min == null && colorStop.stop === rangeMin}
isRangeMax={max == null && colorStop.stop === rangeMax}
data-index={`${STOP_ATTR}${index}`}
key={colorStop.id}
globalMin={min || rangeMin}
globalMax={max || rangeMax}
min={min}
max={max}
localMin={index === 0 ? min || rangeMin : sortedStops[index - 1].stop + 1}
localMax={
index === sortedStops.length - 1
? max || rangeMax
: sortedStops[index + 1].stop - 1
}
stop={colorStop.stop}
color={colorStop.color}
onRemove={
sortedStops.length > 1 ? () => onRemove(colorStop.id) : undefined
}
onChange={stop => handleStopChange(stop, colorStop.id)}
onFocus={() => setFocusedStopIndex(index)}
parentRef={wrapperRef}
colorPickerMode={mode}
colorPickerSwatches={swatches}
disabled={disabled}
readOnly={readOnly}
aria-valuetext={`Stop: ${colorStop.stop}, Color: ${
colorStop.color
} (${index + 1} of ${colorStops.length})`}
isPopoverOpen={colorStop.id === openedStopId}
openPopover={() => {
setOpenedStopId(colorStop.id);
}}
closePopover={() => {
setOpenedStopId(null);
}}
/>
));
const thumbs = useMemo(() => {
const handleStopChange = (stop: ColorStop, id: number) => {
const newColorStops = [...colorStops];
newColorStops.splice(id, 1, stop);
handleOnChange(newColorStops);
};
return sortedStops.map((colorStop, index) => (
<EuiColorStopThumb
isRangeMin={min == null && colorStop.stop === rangeMin}
isRangeMax={max == null && colorStop.stop === rangeMax}
data-index={`${STOP_ATTR}${index}`}
key={colorStop.id}
globalMin={min || rangeMin}
globalMax={max || rangeMax}
min={min}
max={max}
localMin={
index === 0 ? min || rangeMin : sortedStops[index - 1].stop + 1
}
localMax={
index === sortedStops.length - 1
? max || rangeMax
: sortedStops[index + 1].stop - 1
}
stop={colorStop.stop}
color={colorStop.color}
onRemove={
sortedStops.length > 1 ? () => onRemove(colorStop.id) : undefined
}
onChange={stop => handleStopChange(stop, colorStop.id)}
onFocus={() => setFocusedStopIndex(index)}
parentRef={wrapperRef}
colorPickerMode={mode}
colorPickerSwatches={swatches}
disabled={disabled}
readOnly={readOnly}
aria-valuetext={`Stop: ${colorStop.stop}, Color: ${
colorStop.color
} (${index + 1} of ${colorStops.length})`}
isPopoverOpen={colorStop.id === openedStopId}
openPopover={() => {
setOpenedStopId(colorStop.id);
}}
closePopover={() => {
setOpenedStopId(null);
}}
/>
));
}, [
colorStops,
disabled,
handleOnChange,
max,
min,
mode,
onRemove,
openedStopId,
rangeMax,
rangeMin,
readOnly,
sortedStops,
swatches,
wrapperRef,
]);

const positions = wrapperRef
? sortedStops.map(({ stop }) => getPositionFromStopFn(stop))
Expand Down Expand Up @@ -381,16 +425,12 @@ export const EuiColorStops: FunctionComponent<EuiColorStopsProps> = ({
className={classes}
fullWidth={fullWidth}
tabIndex={disabled ? -1 : 0}
onMouseDown={() => !disabled && setIsHoverDisabled(true)}
onMouseUp={() => !disabled && setIsHoverDisabled(false)}
onMouseLeave={() => !disabled && setIsHoverDisabled(false)}
onMouseDown={disableHover}
onMouseUp={enableHover}
onMouseLeave={enableHover}
onKeyDown={handleKeyDown}
onFocus={e => {
if (e.target === wrapperRef) {
setHasFocus(true);
}
}}
onBlur={() => setHasFocus(false)}>
onFocus={setWrapperHasFocus}
onBlur={removeWrapperFocus}>
<EuiScreenReaderOnly>
<p aria-live="polite">
<EuiI18n
Expand Down