NextERP/owl
2
0
Fork 0
mirror of https://github.com/odoo/owl.git synced 2025-10-06 19:59:41 +07:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] store: fix useStore update when mixing state and props changes

Browse Source 
This commit also fixes an issue where updates would not be triggered when the
new and old revNumber where the same but concerned a different object.
This commit is contained in:
Sébastien Theys
2019-11-27 14:23:13 +01:00
committed by Géry Debongnie
parent a6f9b26057
commit 65344dbf1f
2 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/store.ts
+7 -7
View File
@@ -96,14 +96,11 @@ export function useStore(selector, options: SelectorOptions = {}): any {
if (!store.updateFunctions[componentId]) {
store.updateFunctions[componentId] = [];
}
store.updateFunctions[componentId].push(function(): boolean {
function selectCompareUpdate(state, props): boolean {
const oldResult = result;
result = selector(store!.state, component.props);
result = selector(state, props);
const newRevNumber = hashFn(result);
if (
(newRevNumber > 0 && revNumber !== newRevNumber) ||
(newRevNumber === 0 && !isEqual(oldResult, result))
) {
if ((newRevNumber > 0 && revNumber !== newRevNumber) || !isEqual(oldResult, result)) {
revNumber = newRevNumber;
if (options.onUpdate) {
options.onUpdate(result);
@@ -111,6 +108,9 @@ export function useStore(selector, options: SelectorOptions = {}): any {
return true;
}
return false;
}
store.updateFunctions[componentId].push(function(): boolean {
return selectCompareUpdate(store!.state, component.props);
});
useContextWithCB(store, component, function(): Promise<void> | void {
@@ -123,7 +123,7 @@ export function useStore(selector, options: SelectorOptions = {}): any {
}
});
onWillUpdateProps(props => {
result = selector(store.state, props);
selectCompareUpdate(store.state, props);
});
const __destroy = component.__destroy;