Skip to content

Picker and Suggestions: Move the styled call out of render call. #8834

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
Jason Gore (JasonGore) merged 6 commits into from
Apr 25, 2019
Merged

Picker and Suggestions: Move the styled call out of render call. #8834

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
99c2834
Move the styled call out of render call.
lijunle Apr 24, 2019
6d95ef1
Add change file.
lijunle Apr 24, 2019
a6022eb
Remove debugging code.
lijunle Apr 24, 2019
a0f15df
Update the API doc.
lijunle Apr 24, 2019
d84d3fb
Polish the typing.
lijunle Apr 25, 2019
1e44ef9
Merge remote-tracking branch 'OfficeDev/master' into picker/fix-flashing
lijunle Apr 25, 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
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/picker-fix-flashing_2019-04-24-10-15.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Fix the picker suggestion items flashing issue.",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "lijunle@gmail.com"
}
2 changes: 0 additions & 2 deletions packages/office-ui-fabric-react/etc/office-ui-fabric-react.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,6 @@ export class BasePicker<T, P extends IBasePickerProps<T>> extends BaseComponent<
// (undocumented)
protected suggestionElement: React.RefObject<ISuggestions<T>>;
// (undocumented)
protected SuggestionOfProperType: new (props: ISuggestionsProps<T>) => Suggestions<T>;
// (undocumented)
protected suggestionStore: SuggestionsController<T>;
// (undocumented)
protected updateSuggestions(suggestions: any[]): void;
Expand Down
20 changes: 8 additions & 12 deletions packages/office-ui-fabric-react/src/components/pickers/BasePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ export type IPickerAriaIds = {

const getClassNames = classNamesFunction<IBasePickerStyleProps, IBasePickerStyles>();

const StyledSuggestions = styled<ISuggestionsProps<any>, ISuggestionsStyleProps, ISuggestionsStyles>(
Suggestions,
suggestionsStyles,
undefined,
{ scope: 'Suggestions' }
);

export class BasePicker<T, P extends IBasePickerProps<T>> extends BaseComponent<P, IBasePickerState> implements IBasePicker<T> {
// Refs
protected root = React.createRef<HTMLDivElement>();
Expand All @@ -57,7 +64,6 @@ export class BasePicker<T, P extends IBasePickerProps<T>> extends BaseComponent<

protected selection: Selection;
protected suggestionStore: SuggestionsController<T>;
protected SuggestionOfProperType = Suggestions as new (props: ISuggestionsProps<T>) => Suggestions<T>;
protected currentPromise: PromiseLike<any> | undefined;
protected _ariaMap: IPickerAriaIds;
private _id: string;
Expand Down Expand Up @@ -277,17 +283,7 @@ export class BasePicker<T, P extends IBasePickerProps<T>> extends BaseComponent<
}

protected renderSuggestions(): JSX.Element | null {
const TypedSuggestions = this.SuggestionOfProperType;

// TODO:
// Move this styled component in a separate file and make it available to the public API.
// This should be done after rewriting pickers to use a composition pattern instead of inheritance.
const StyledTypedSuggestions = styled<ISuggestionsProps<T>, ISuggestionsStyleProps, ISuggestionsStyles>(
TypedSuggestions,
suggestionsStyles,
undefined,
{ scope: 'Suggestions' }
);
const StyledTypedSuggestions: React.StatelessComponent<ISuggestionsProps<T>> = StyledSuggestions;

return this.state.suggestionsVisible && this.input ? (
<Callout
Expand Down
22 changes: 8 additions & 14 deletions packages/office-ui-fabric-react/src/components/pickers/Suggestions/Suggestions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,17 @@ export interface ISuggestionsState {
selectedActionType: SuggestionActionType;
}

const StyledSuggestionsItem = styled<ISuggestionItemProps<any>, ISuggestionsItemStyleProps, ISuggestionsItemStyles>(
SuggestionsItem,
suggestionsItemStyles,
undefined,
{ scope: 'SuggestionItem' }
);

export class Suggestions<T> extends BaseComponent<ISuggestionsProps<T>, ISuggestionsState> {
protected _forceResolveButton = React.createRef<IButton>();
protected _searchForMoreButton = React.createRef<IButton>();
protected _selectedElement = React.createRef<HTMLDivElement>();
private SuggestionsItemOfProperType = SuggestionsItem as new (props: ISuggestionItemProps<T>) => SuggestionsItem<T>;
private activeSelectedElement: HTMLDivElement | null;
private _classNames: Partial<IProcessedStyleSet<ISuggestionsStyles>>;

Expand Down Expand Up @@ -307,19 +313,7 @@ export class Suggestions<T> extends BaseComponent<ISuggestionsProps<T>, ISuggest

let { suggestions } = this.props;

const TypedSuggestionsItem = this.SuggestionsItemOfProperType;

// TODO:
// Move this styled component in a separate file and make it available to the public API.
// This should be done after rewriting pickers to use a composition pattern instead of inheritance.
const StyledTypedSuggestionsItem = styled<ISuggestionItemProps<T>, ISuggestionsItemStyleProps, ISuggestionsItemStyles>(
TypedSuggestionsItem,
suggestionsItemStyles,
undefined,
{
scope: 'SuggestionItem'
}
);
const StyledTypedSuggestionsItem: React.StatelessComponent<ISuggestionItemProps<T>> = StyledSuggestionsItem;

let selectedIndex = -1;
suggestions.some((element, index) => {
Expand Down