Skip to content

Fix/colorpicker debounce #2777

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 6 commits into from
Oct 25, 2023
Merged

Fix/colorpicker debounce #2777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ee659b8
Formats
nitzanyiz Oct 22, 2023
06030ea
Added deboune to slider value updating
nitzanyiz Oct 22, 2023
0d990de
Changed from debounce to throttle
nitzanyiz Oct 23, 2023
825f7c1
Added throttle to old slider component
nitzanyiz Oct 23, 2023
a43a58a
Reverting changes to older slider component
nitzanyiz Oct 23, 2023
ab5c564
added migrate to ColorPickerDialog
nitzanyiz Oct 23, 2023
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
1 change: 1 addition & 0 deletions src/components/colorPicker/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ class ColorPicker extends PureComponent<Props> {
doneButton: accessibilityLabels?.doneButton,
input: accessibilityLabels?.input
}}
migrate
/>
</View>
);
Expand Down
90 changes: 44 additions & 46 deletions src/components/slider/index.tsx
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the changes in this file are only formatting?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. Should I just revert them?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can keep it

Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const INACTIVE_COLOR = Colors.$backgroundNeutralMedium;
const MIN_RANGE_GAP = 4;

export type SliderOnValueChange = (value: number) => void;
export type SliderOnRangeChange = (values: {min: number, max: number}) => void;
export type SliderOnRangeChange = (values: {min: number; max: number}) => void;

export type SliderProps = Omit<ThumbProps, 'ref'> & {
/**
Expand Down Expand Up @@ -142,7 +142,7 @@ type Measurements = {

type ThumbStyle = {style?: StyleProp<ViewStyle>; left?: StyleProp<number>};

type MinTrackStyle = {style?: StyleProp<ViewStyle>; width?: StyleProp<number>, left?: StyleProp<number>};
type MinTrackStyle = {style?: StyleProp<ViewStyle>; width?: StyleProp<number>; left?: StyleProp<number>};

type MeasuredVariableName = 'containerSize' | 'trackSize' | 'thumbSize';

Expand Down Expand Up @@ -220,7 +220,8 @@ export default class Slider extends PureComponent<SliderProps, State> {
});
}

reset() { // NOTE: used with ref
reset() {
// NOTE: used with ref
this.lastValue = this.initialValue;
this.lastMinValue = this.minInitialValue;
this.lastDx = 0;
Expand Down Expand Up @@ -399,8 +400,10 @@ export default class Slider extends PureComponent<SliderProps, State> {

if (useRange) {
const minThumbPosition = this._minThumbStyles?.left as number;
if (useGap && left > minThumbPosition + thumbSize.width + MIN_RANGE_GAP
|| !useGap && left >= minThumbPosition) {
if (
(useGap && left > minThumbPosition + thumbSize.width + MIN_RANGE_GAP) ||
(!useGap && left >= minThumbPosition)
) {
this._thumbStyles.left = left;

const width = left - minThumbPosition;
Expand Down Expand Up @@ -433,8 +436,10 @@ export default class Slider extends PureComponent<SliderProps, State> {
const left = trackSize.width === 0 ? _x : (_x * nonOverlappingTrackWidth) / trackSize.width; // do not render above prefix\suffix icon\text

const maxThumbPosition = this._thumbStyles?.left as number;
if (useGap && left < maxThumbPosition - thumbSize.width - MIN_RANGE_GAP
|| !useGap && left <= maxThumbPosition) {
if (
(useGap && left < maxThumbPosition - thumbSize.width - MIN_RANGE_GAP) ||
(!useGap && left <= maxThumbPosition)
) {
this._minThumbStyles.left = left;

this._minTrackStyles.width = maxThumbPosition - x;
Expand Down Expand Up @@ -483,7 +488,8 @@ export default class Slider extends PureComponent<SliderProps, State> {

get disableRTL() {
const {disableRTL, useRange} = this.props;
if (useRange) { // block forceRTL on range slider
if (useRange) {
// block forceRTL on range slider
return false;
}
return disableRTL;
Expand Down Expand Up @@ -552,7 +558,8 @@ export default class Slider extends PureComponent<SliderProps, State> {

let values = {min: this.lastMinValue, max: this.lastValue};

if (Constants.isRTL && this.props.disableRTL) { // forceRTL for range slider
if (Constants.isRTL && this.props.disableRTL) {
// forceRTL for range slider
const {maximumValue} = this.props;
values = {min: maximumValue - this.lastValue, max: maximumValue - this.lastMinValue};
}
Expand Down Expand Up @@ -693,40 +700,35 @@ export default class Slider extends PureComponent<SliderProps, State> {
maximumTrackTintColor = DEFAULT_COLOR
} = this.props;

return (
_.isFunction(renderTrack) ? (
return _.isFunction(renderTrack) ? (
<View style={[styles.track, {backgroundColor: maximumTrackTintColor}, trackStyle]} onLayout={this.onTrackLayout}>
{renderTrack()}
</View>
) : (
<View>
<View
style={[styles.track, {backgroundColor: maximumTrackTintColor}, trackStyle]}
style={[
styles.track,
trackStyle,
{
backgroundColor: disabled ? INACTIVE_COLOR : maximumTrackTintColor
}
]}
onLayout={this.onTrackLayout}
>
{renderTrack()}
</View>
) : (
<View>
<View
style={[
styles.track,
trackStyle,
{
backgroundColor: disabled ? INACTIVE_COLOR : maximumTrackTintColor
}
]}
onLayout={this.onTrackLayout}
/>
<View
ref={this.minTrack}
style={[
styles.track,
trackStyle,
styles.minimumTrack,
this.shouldForceLTR && styles.trackDisableRTL,
{
backgroundColor: disabled ? DEFAULT_COLOR : minimumTrackTintColor
}
]}
/>
</View>
)
/>
<View
ref={this.minTrack}
style={[
styles.track,
trackStyle,
styles.minimumTrack,
this.shouldForceLTR && styles.trackDisableRTL,
{
backgroundColor: disabled ? DEFAULT_COLOR : minimumTrackTintColor
}
]}
/>
</View>
);
}

Expand All @@ -736,11 +738,7 @@ export default class Slider extends PureComponent<SliderProps, State> {
if (useGap) {
return this.renderMinThumb();
}
return (
<View style={{zIndex: this.isDefaultThumbActive() ? 0 : 1, top: '-50%'}}>
{this.renderMinThumb()}
</View>
);
return <View style={{zIndex: this.isDefaultThumbActive() ? 0 : 1, top: '-50%'}}>{this.renderMinThumb()}</View>;
}
}

Expand Down