Skip to content

Fix render stability of IconPicker grid and update usage of deprecated Dropdown property #230

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
fabiankaegy merged 7 commits into from
Jun 21, 2023
Merged

Fix render stability of IconPicker grid and update usage of deprecated Dropdown property #230

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b8aeee4
fix update deprecated position prop on Dropdown component
fabiankaegy Jun 6, 2023
dfbd088
fix refactor icon label into its own component to improve render stab…
fabiankaegy Jun 6, 2023
6deefed
fix rename isSelected prop of styles icon button component
fabiankaegy Jun 6, 2023
6bbb2d5
1.15.11-alpha.0
fabiankaegy Jun 6, 2023
8d52fae
1.15.11-alpha.1
fabiankaegy Jun 6, 2023
30fc712
fix make selected icon optional in all IconPicker components
fabiankaegy Jun 6, 2023
96a4f1b
1.15.11-alpha.2
fabiankaegy Jun 6, 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
Prev Previous commit
Next Next commit
fix make selected icon optional in all IconPicker components
  • Loading branch information
@fabiankaegy
fabiankaegy committed Jun 6, 2023
commit 30fc712377ddfb99d4d98e742eee6ce353f6182b
8 changes: 3 additions & 5 deletions components/icon-picker/icon-picker-toolbar-button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@ const StyledIconPickerDropdown = styled(IconPicker)`
* @returns {*}
*/
export const IconPickerToolbarButton = (props) => {
const {
value: { name, iconSet },
buttonLabel,
} = props;
const { value, buttonLabel } = props;

const buttonIcon = name && iconSet ? <Icon name={name} iconSet={iconSet} /> : null;
const buttonIcon =
value?.name && value?.iconSet ? <Icon name={value?.name} iconSet={value?.iconSet} /> : null;

return (
<Dropdown
Expand Down
2 changes: 1 addition & 1 deletion components/icon-picker/icon-picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ const IconGrid = (props) => {
<StyledIconGrid orientation="vertical" className="component-icon-picker__list">
{icons.map((icon) => {
const isChecked =
selectedIcon?.name === icon.name && selectedIcon?.iconSet === icon.iconSet;
selectedIcon?.name === icon?.name && selectedIcon?.iconSet === icon?.iconSet;

return (
<CheckboxControl
Expand Down
2 changes: 1 addition & 1 deletion components/icon-picker/inline-icon-picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export const InlineIconPicker = (props) => {
const { value, ...rest } = props;
const IconButton = useCallback(
({ onToggle }) => (
<Icon name={value.name} iconSet={value.iconSet} onClick={onToggle} {...rest} />
<Icon name={value?.name} iconSet={value?.iconSet} onClick={onToggle} {...rest} />
),
[value, rest],
);
Expand Down