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

Fix StrictMode errors in FixedDataTableContainer #740

Merged
merged 2 commits into from
Dec 16, 2024
Merged

Fix StrictMode errors in FixedDataTableContainer #740

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41cd350
Fix StrictMode errors in FixedDataTableContainer
pradeepnschrodinger Dec 14, 2024
809bf4d
Remove redundant check in getDerivedStateFromProps
pradeepnschrodinger Dec 14, 2024
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
62 changes: 45 additions & 17 deletions src/FixedDataTableContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,7 @@ class FixedDataTableContainer extends React.Component {
constructor(props) {
super(props);

this.reduxStore = FixedDataTableStore.get();

this.scrollActions = getScrollActions(this.reduxStore, () => this.props);

this.reduxStore.dispatch(initialize(props));

this.unsubscribe = this.reduxStore.subscribe(this.onStoreUpdate.bind(this));
this.state = {
boundState: FixedDataTableContainer.getBoundState(this.reduxStore), // the state from the redux store
reduxStore: this.reduxStore, // put store instance in local state so that getDerivedStateFromProps can access it
props, // put props in local state so that getDerivedStateFromProps can access it
};
this._initialize(props);

this.fixedDataTableApi = createApi();
this.previousApiValue = null;
Expand Down Expand Up @@ -83,18 +72,57 @@ class FixedDataTableContainer extends React.Component {
};
}

componentDidMount() {
this._initialize(this.props);
}

componentWillUnmount() {
if (this.unsubscribe) {
this.unsubscribe();
this.unsubscribe = null;
}
this.reduxStore = null;
this._cleanup();
}

componentDidUpdate() {
this.notifyApiValueChanges();
}

_initialize(props) {
if (this.reduxStore) {
// already initialized
return;
}

this.reduxStore = FixedDataTableStore.get();
this.reduxStore.dispatch(initialize(props));

this.scrollActions = getScrollActions(this.reduxStore, () => this.props);

this.unsubscribe = this.reduxStore.subscribe(this.onStoreUpdate.bind(this));

const state = {
boundState: FixedDataTableContainer.getBoundState(this.reduxStore), // the state from the redux store
reduxStore: this.reduxStore, // put store instance in local state so that getDerivedStateFromProps can access it
props, // put props in local state so that getDerivedStateFromProps can access it
};

if (this.state) {
// component is already constructed, so just update state
this.setState(state);
} else {
// component isn't constructed yet, so initialize state
this.state = state;
}
}

_cleanup() {
if (!this.reduxStore) {
// already cleaned up
return;
}

this.unsubscribe();
this.unsubscribe = null;
this.reduxStore = null;
}

/**
* Returns FDT's public API.
*
Expand Down
Loading