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

Jump to bottom

chore: optimize search performance #586

Merged
merged 1 commit into from
Jan 6, 2021
Merged

chore: optimize search performance #586

Show file tree
Hide file tree
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
14 changes: 8 additions & 6 deletions src/generate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ export default function generateSelector<
React.useImperativeHandle(ref, () => ({
focus: selectorRef.current.focus,
blur: selectorRef.current.blur,
scrollTo: listRef.current?.scrollTo,
scrollTo: listRef.current?.scrollTo as ScrollTo,
}));

// ============================= Value ==============================
Expand All @@ -380,7 +380,9 @@ export default function generateSelector<
});

/** Unique raw values */
const mergedRawValue = useMemo<RawValueType[]>(
const [mergedRawValue, mergedValueMap] = useMemo<
[RawValueType[], Map<RawValueType, LabelValueType>]
>(
() =>
toInnerValue(mergedValue, {
labelInValue: mergedLabelInValue,
Expand Down Expand Up @@ -431,7 +433,7 @@ export default function generateSelector<
[mergedOptions],
);

const getValueOption = useCacheOptions(mergedRawValue, mergedFlattenOptions);
const getValueOption = useCacheOptions(mergedFlattenOptions);

// Display options for OptionList
const displayOptions = useMemo<OptionsType>(() => {
Expand Down Expand Up @@ -476,7 +478,7 @@ export default function generateSelector<
const valueOptions = getValueOption([val]);
const displayValue = getLabeledValue(val, {
options: valueOptions,
prevValue: mergedValue,
prevValueMap: mergedValueMap,
labelInValue: mergedLabelInValue,
optionLabelProp: mergedOptionLabelProp,
});
Expand Down Expand Up @@ -511,7 +513,7 @@ export default function generateSelector<
const selectValue = (mergedLabelInValue
? getLabeledValue(newValue, {
options: newValueOption,
prevValue: mergedValue,
prevValueMap: mergedValueMap,
labelInValue: mergedLabelInValue,
optionLabelProp: mergedOptionLabelProp,
})
Expand Down Expand Up @@ -546,7 +548,7 @@ export default function generateSelector<
labelInValue: mergedLabelInValue,
options: newRawValuesOptions,
getLabeledValue,
prevValue: mergedValue,
prevValueMap: mergedValueMap,
optionLabelProp: mergedOptionLabelProp,
});

Expand Down
4 changes: 2 additions & 2 deletions src/hooks/useCacheOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function useCacheOptions<
key?: Key;
disabled?: boolean;
}[]
>(values: RawValueType[], options: FlattenOptionsType<OptionsType>) {
>(options: FlattenOptionsType<OptionsType>) {
const prevOptionMapRef = React.useRef<Map<RawValueType, FlattenOptionsType<OptionsType>[number]>>(
null,
);
Expand All @@ -22,7 +22,7 @@ export default function useCacheOptions<
map.set(value, item);
});
return map;
}, [values, options]);
Copy link
Member

Choose a reason for hiding this comment

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

当时为啥要把 values 作为 cache 条件？

Copy link
Member Author

Choose a reason for hiding this comment

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

不知道是咋了，今天看的时候才发现没有用到，😂

}, [options]);

prevOptionMapRef.current = optionMap;

Expand Down
2 changes: 1 addition & 1 deletion src/interface/generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export type GetLabeledValue<FOT extends FlattenOptionsType> = (
value: RawValueType,
config: {
options: FOT;
prevValue: DefaultValueType;
prevValueMap: Map<RawValueType, LabelValueType>;
labelInValue: boolean;
optionLabelProp: string;
},
Expand Down
34 changes: 17 additions & 17 deletions src/utils/commonUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,26 @@ export function toArray<T>(value: T | T[]): T[] {
export function toInnerValue(
value: DefaultValueType,
{ labelInValue, combobox }: { labelInValue: boolean; combobox: boolean },
): RawValueType[] {
): [RawValueType[], Map<RawValueType, LabelValueType>] {
const valueMap = new Map<RawValueType, LabelValueType>();

if (value === undefined || (value === '' && combobox)) {
return [];
return [[], valueMap];
}

const values = Array.isArray(value) ? value : [value];
let rawValues = values as RawValueType[];

if (labelInValue) {
return (values as LabelValueType[]).map(
({ key, value: val }: LabelValueType) => (val !== undefined ? val : key),
);
rawValues = (values as LabelValueType[]).map((itemValue: LabelValueType) => {
const { key, value: val } = itemValue;
const finalVal = val !== undefined ? val : key;
valueMap.set(finalVal, itemValue);
return finalVal;
});
}

return values as RawValueType[];
return [rawValues, valueMap];
}

/**
Expand All @@ -43,15 +49,15 @@ export function toOuterValues<FOT extends FlattenOptionsType>(
{
optionLabelProp,
labelInValue,
prevValue,
prevValueMap,
options,
getLabeledValue,
}: {
optionLabelProp: string;
labelInValue: boolean;
getLabeledValue: GetLabeledValue<FOT>;
options: FOT;
prevValue: DefaultValueType;
prevValueMap: Map<RawValueType, LabelValueType>;
},
): RawValueType[] | LabelValueType[] {
let values: DefaultValueType = valueList;
Expand All @@ -60,7 +66,7 @@ export function toOuterValues<FOT extends FlattenOptionsType>(
values = values.map(val =>
getLabeledValue(val, {
options,
prevValue,
prevValueMap,
labelInValue,
optionLabelProp,
}),
Expand All @@ -77,11 +83,7 @@ export function removeLastEnabledValue<
const newValues = [...values];

let removeIndex: number;
for (
removeIndex = measureValues.length - 1;
removeIndex >= 0;
removeIndex -= 1
) {
for (removeIndex = measureValues.length - 1; removeIndex >= 0; removeIndex -= 1) {
if (!measureValues[removeIndex].disabled) {
break;
}
Expand All @@ -101,9 +103,7 @@ export function removeLastEnabledValue<
}

export const isClient =
typeof window !== 'undefined' &&
window.document &&
window.document.documentElement;
typeof window !== 'undefined' && window.document && window.document.documentElement;

/** Is client side and not jsdom */
export const isBrowserClient = process.env.NODE_ENV !== 'test' && isClient;
Expand Down
14 changes: 2 additions & 12 deletions src/utils/valueUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,24 +119,14 @@ export function findValueOption(

export const getLabeledValue: GetLabeledValue<FlattenOptionData[]> = (
value,
{ options, prevValue, labelInValue, optionLabelProp },
{ options, prevValueMap, labelInValue, optionLabelProp },
) => {
const item = findValueOption([value], options)[0];
const result: LabelValueType = {
value,
};

let prevValItem: LabelValueType;
const prevValues = toArray<RawValueType | LabelValueType>(prevValue);
if (labelInValue) {
prevValItem = prevValues.find((prevItem: LabelValueType) => {
if (typeof prevItem === 'object' && 'value' in prevItem) {
return prevItem.value === value;
}
// [Legacy] Support `key` as `value`
return prevItem.key === value;
}) as LabelValueType;
}
const prevValItem: LabelValueType = labelInValue ? prevValueMap.get(value) : undefined;

if (prevValItem && typeof prevValItem === 'object' && 'label' in prevValItem) {
result.label = prevValItem.label;
Expand Down