Skip to content

fix: add checks for contentRef to avoid errors in console #10870

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 1 commit into from
Sep 26, 2024
Merged

fix: add checks for contentRef to avoid errors in console #10870

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
26 changes: 16 additions & 10 deletions packages/react-core/src/components/ExpandableSection/ExpandableSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export interface ExpandableSectionProps extends React.HTMLProps<HTMLDivElement>
interface ExpandableSectionState {
isExpanded: boolean;
hasToggle: boolean;
previousWidth: number;
previousWidth?: number;
}

const setLineClamp = (lines: number, element: HTMLDivElement) => {
Expand All @@ -87,7 +87,7 @@ class ExpandableSection extends React.Component<ExpandableSectionProps, Expandab
super(props);

this.state = {
isExpanded: props.isExpanded,
isExpanded: props.isExpanded || false,
hasToggle: true,
previousWidth: undefined
};
Expand Down Expand Up @@ -129,6 +129,9 @@ class ExpandableSection extends React.Component<ExpandableSectionProps, Expandab
componentDidMount() {
if (this.props.variant === ExpandableSectionVariant.truncate) {
const expandableContent = this.expandableContentRef.current;
if (!expandableContent) {
return;
}
this.setState({ previousWidth: expandableContent.offsetWidth });
this.observer = getResizeObserver(expandableContent, this.handleResize, false);

Expand All @@ -143,6 +146,8 @@ class ExpandableSection extends React.Component<ExpandableSectionProps, Expandab
componentDidUpdate(prevProps: ExpandableSectionProps) {
if (
this.props.variant === ExpandableSectionVariant.truncate &&
this.props.truncateMaxLines &&
this.expandableContentRef.current &&
(prevProps.truncateMaxLines !== this.props.truncateMaxLines || prevProps.children !== this.props.children)
) {
const expandableContent = this.expandableContentRef.current;
Expand Down Expand Up @@ -171,12 +176,13 @@ class ExpandableSection extends React.Component<ExpandableSectionProps, Expandab
};

resize = () => {
if (this.expandableContentRef.current) {
const { offsetWidth } = this.expandableContentRef.current;
if (this.state.previousWidth !== offsetWidth) {
this.setState({ previousWidth: offsetWidth });
this.checkToggleVisibility();
}
if (!this.expandableContentRef.current) {
return;
}
const { offsetWidth } = this.expandableContentRef.current;
if (this.state.previousWidth !== offsetWidth) {
this.setState({ previousWidth: offsetWidth });
this.checkToggleVisibility();
}
};
handleResize = debounce(this.resize, 250);
Expand Down Expand Up @@ -221,7 +227,7 @@ class ExpandableSection extends React.Component<ExpandableSectionProps, Expandab
if (isExpanded === undefined) {
propOrStateIsExpanded = this.state.isExpanded;
onToggle = (event, isOpen) => {
this.setState({ isExpanded: isOpen }, () => onToggleProp(event, this.state.isExpanded));
this.setState({ isExpanded: isOpen }, () => onToggleProp?.(event, this.state.isExpanded));
};
}

Expand All @@ -239,7 +245,7 @@ class ExpandableSection extends React.Component<ExpandableSectionProps, Expandab
aria-expanded={propOrStateIsExpanded}
aria-controls={uniqueContentId}
id={uniqueToggleId}
onClick={(event) => onToggle(event, !propOrStateIsExpanded)}
onClick={(event) => onToggle?.(event, !propOrStateIsExpanded)}
>
{variant !== ExpandableSectionVariant.truncate && (
<span className={css(styles.expandableSectionToggleIcon)}>
Expand Down