Skip to content

Revert "fix(Toolbar*): change spelling of visiblity prop" #4556

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
redallen merged 1 commit into from
Jul 16, 2020
Merged

Revert "fix(Toolbar*): change spelling of visiblity prop" #4556

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
19 changes: 1 addition & 18 deletions packages/react-core/src/components/Toolbar/ToolbarContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@ export interface ToolbarContentProps extends React.HTMLProps<HTMLDivElement> {
/** Classes applied to root element of the data toolbar content row */
className?: string;
/** Visibility at various breakpoints. */
visibility?: {
default?: 'hidden' | 'visible';
md?: 'hidden' | 'visible';
lg?: 'hidden' | 'visible';
xl?: 'hidden' | 'visible';
'2xl'?: 'hidden' | 'visible';
};
/** Deprecated: prop misspelled */
visiblity?: {
default?: 'hidden' | 'visible';
md?: 'hidden' | 'visible';
Expand Down Expand Up @@ -63,7 +55,6 @@ export class ToolbarContent extends React.Component<ToolbarContentProps> {
children,
isExpanded,
toolbarId,
visibility,
visiblity,
alignment,
clearAllFilters,
Expand All @@ -72,19 +63,11 @@ export class ToolbarContent extends React.Component<ToolbarContentProps> {
...props
} = this.props;

if (visiblity !== undefined) {
// eslint-disable-next-line no-console
console.warn(
'The ToolbarContent visiblity prop has been deprecated. ' +
'Please use the correctly spelled visibility prop instead.'
);
}

return (
<div
className={css(
styles.toolbarContent,
formatBreakpointMods(visibility || visiblity, styles),
formatBreakpointMods(visiblity, styles),
formatBreakpointMods(alignment, styles),
className
)}
Expand Down
32 changes: 2 additions & 30 deletions packages/react-core/src/components/Toolbar/ToolbarGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@ export interface ToolbarGroupProps extends Omit<React.HTMLProps<HTMLDivElement>,
/** A type modifier which modifies spacing specifically depending on the type of group */
variant?: ToolbarGroupVariant | 'filter-group' | 'icon-button-group' | 'button-group';
/** Visibility at various breakpoints. */
visibility?: {
default?: 'hidden' | 'visible';
md?: 'hidden' | 'visible';
lg?: 'hidden' | 'visible';
xl?: 'hidden' | 'visible';
'2xl'?: 'hidden' | 'visible';
};
/** Deprecated: prop misspelled */
visiblity?: {
default?: 'hidden' | 'visible';
md?: 'hidden' | 'visible';
Expand Down Expand Up @@ -62,33 +54,13 @@ export interface ToolbarGroupProps extends Omit<React.HTMLProps<HTMLDivElement>,

class ToolbarGroupWithRef extends React.Component<ToolbarGroupProps> {
render() {
const {
visibility,
visiblity,
alignment,
spacer,
spaceItems,
className,
variant,
children,
innerRef,
...props
} = this.props;

if (visiblity !== undefined) {
// eslint-disable-next-line no-console
console.warn(
'The ToolbarGroup visiblity prop has been deprecated. ' +
'Please use the correctly spelled visibility prop instead.'
);
}

const { visiblity, alignment, spacer, spaceItems, className, variant, children, innerRef, ...props } = this.props;
return (
<div
className={css(
styles.toolbarGroup,
variant && styles.modifiers[toCamel(variant) as 'filterGroup' | 'iconButtonGroup' | 'buttonGroup'],
formatBreakpointMods(visibility || visiblity, styles),
formatBreakpointMods(visiblity, styles),
formatBreakpointMods(alignment, styles),
formatBreakpointMods(spacer, styles),
formatBreakpointMods(spaceItems, styles),
Expand Down
19 changes: 1 addition & 18 deletions packages/react-core/src/components/Toolbar/ToolbarItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,6 @@ export interface ToolbarItemProps extends React.HTMLProps<HTMLDivElement> {
| 'chip-group'
| 'separator';
/** Visibility at various breakpoints. */
visibility?: {
default?: 'hidden' | 'visible';
md?: 'hidden' | 'visible';
lg?: 'hidden' | 'visible';
xl?: 'hidden' | 'visible';
'2xl'?: 'hidden' | 'visible';
};
/** Deprecated: prop misspelled */
visiblity?: {
default?: 'hidden' | 'visible';
md?: 'hidden' | 'visible';
Expand Down Expand Up @@ -69,7 +61,6 @@ export interface ToolbarItemProps extends React.HTMLProps<HTMLDivElement> {
export const ToolbarItem: React.FunctionComponent<ToolbarItemProps> = ({
className,
variant,
visibility,
visiblity,
alignment,
spacer,
Expand All @@ -81,14 +72,6 @@ export const ToolbarItem: React.FunctionComponent<ToolbarItemProps> = ({
return <Divider className={css(styles.modifiers.vertical, className)} {...props} />;
}

if (visiblity !== undefined) {
// eslint-disable-next-line no-console
console.warn(
'The ToolbarItem visiblity prop has been deprecated. ' +
'Please use the correctly spelled visibility prop instead.'
);
}

return (
<div
className={css(
Expand All @@ -97,7 +80,7 @@ export const ToolbarItem: React.FunctionComponent<ToolbarItemProps> = ({
styles.modifiers[
toCamel(variant) as 'bulkSelect' | 'overflowMenu' | 'pagination' | 'searchFilter' | 'label' | 'chipGroup'
],
formatBreakpointMods(visibility || visiblity, styles),
formatBreakpointMods(visiblity, styles),
formatBreakpointMods(alignment, styles),
formatBreakpointMods(spacer, styles),
className
Expand Down
19 changes: 1 addition & 18 deletions packages/react-core/src/components/Toolbar/ToolbarToggleGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@ export interface ToolbarToggleGroupProps extends ToolbarGroupProps {
/** Controls when filters are shown and when the toggle button is hidden. */
breakpoint: 'md' | 'lg' | 'xl' | '2xl';
/** Visibility at various breakpoints. */
visibility?: {
default?: 'hidden' | 'visible';
md?: 'hidden' | 'visible';
lg?: 'hidden' | 'visible';
xl?: 'hidden' | 'visible';
'2xl'?: 'hidden' | 'visible';
};
/** Deprecated: prop misspelled */
visiblity?: {
default?: 'hidden' | 'visible';
md?: 'hidden' | 'visible';
Expand Down Expand Up @@ -68,7 +60,6 @@ export class ToolbarToggleGroup extends React.Component<ToolbarToggleGroupProps>
const {
toggleIcon,
variant,
visibility,
visiblity,
breakpoint,
alignment,
Expand All @@ -84,14 +75,6 @@ export class ToolbarToggleGroup extends React.Component<ToolbarToggleGroupProps>
console.error('ToolbarToggleGroup will not be visible without a breakpoint or toggleIcon.');
}

if (visiblity !== undefined) {
// eslint-disable-next-line no-console
console.warn(
'The ToolbarToggleGroup visiblity prop has been deprecated. ' +
'Please use the correctly spelled visibility prop instead.'
);
}

return (
<ToolbarContext.Consumer>
{({ isExpanded, toggleIsExpanded }) => (
Expand Down Expand Up @@ -119,7 +102,7 @@ export class ToolbarToggleGroup extends React.Component<ToolbarToggleGroupProps>
| 'showOnXl'
| 'showOn_2xl'
],
formatBreakpointMods(visibility || visiblity, styles),
formatBreakpointMods(visiblity, styles),
formatBreakpointMods(alignment, styles),
formatBreakpointMods(spacer, styles),
formatBreakpointMods(spaceItems, styles),
Expand Down