react-native-onyx 1.0.102 → 1.0.104

package/dist/web.development.js

@@ -2601,6 +2601,15 @@ function getDisplayName(component) {
   return component.displayName || component.name || 'Component';
 }
 
+/**
+ * Removes all the keys from state that are unrelated to the onyx data being mapped to the component.
+ *
+ * @param {Object} state of the component
+ * @param {Object} onyxToStateMapping the object holding all of the mapping configuration for the component
+ * @returns {Object}
+ */
+const getOnyxDataFromState = (state, onyxToStateMapping) => underscore__WEBPACK_IMPORTED_MODULE_2___default().pick(state, underscore__WEBPACK_IMPORTED_MODULE_2___default().keys(onyxToStateMapping));
+
 /* harmony default export */ function __WEBPACK_DEFAULT_EXPORT__(mapOnyxToState) {let shouldDelayUpdates = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   // A list of keys that must be present in tempState before we can render the WrappedComponent
   const requiredKeysForInit = underscore__WEBPACK_IMPORTED_MODULE_2___default().chain(mapOnyxToState).
@@ -2673,16 +2682,20 @@ function getDisplayName(component) {
         this.checkEvictableKeys();
       }
 
-      componentDidUpdate(prevProps) {
+      componentDidUpdate() {
+        // When the state is passed to the key functions with Str.result(), omit anything
+        // from state that was not part of the mapped keys.
+        const onyxDataFromState = getOnyxDataFromState(this.state, mapOnyxToState);
+
         // If any of the mappings use data from the props, then when the props change, all the
         // connections need to be reconnected with the new props
-        underscore__WEBPACK_IMPORTED_MODULE_2___default().each(mapOnyxToState, (mapping, propertyName) => {
-          const previousKey = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, prevProps);
-          const newKey = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, this.props);
+        underscore__WEBPACK_IMPORTED_MODULE_2___default().each(mapOnyxToState, (mapping, propName) => {
+          const previousKey = mapping.previousKey;
+          const newKey = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, { ...this.props, ...onyxDataFromState });
           if (previousKey !== newKey) {
             _Onyx__WEBPACK_IMPORTED_MODULE_4__["default"].disconnect(this.activeConnectionIDs[previousKey], previousKey);
             delete this.activeConnectionIDs[previousKey];
-            this.connectMappingToOnyx(mapping, propertyName);
+            this.connectMappingToOnyx(mapping, propName);
           }
         });
         this.checkEvictableKeys();
@@ -2691,9 +2704,8 @@ function getDisplayName(component) {
       componentWillUnmount() {
         // Disconnect everything from Onyx
         underscore__WEBPACK_IMPORTED_MODULE_2___default().each(mapOnyxToState, (mapping) => {
-          const key = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, this.props);
-          const connectionID = this.activeConnectionIDs[key];
-          _Onyx__WEBPACK_IMPORTED_MODULE_4__["default"].disconnect(connectionID, key);
+          const key = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, { ...this.props, ...getOnyxDataFromState(this.state, mapOnyxToState) });
+          _Onyx__WEBPACK_IMPORTED_MODULE_4__["default"].disconnect(this.activeConnectionIDs[key], key);
         });
       }
 
@@ -2825,7 +2837,14 @@ function getDisplayName(component) {
        *  component
        */
       connectMappingToOnyx(mapping, statePropertyName) {
-        const key = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, this.props);
+        const key = _Str__WEBPACK_IMPORTED_MODULE_3__.result(mapping.key, { ...this.props, ...getOnyxDataFromState(this.state, mapOnyxToState) });
+
+        // Remember the previous key so that if it ever changes, the component will reconnect to Onyx
+        // in componentDidUpdate
+        if (statePropertyName !== 'initialValue' && mapOnyxToState[statePropertyName]) {
+          // eslint-disable-next-line no-param-reassign
+          mapOnyxToState[statePropertyName].previousKey = key;
+        }
 
         // eslint-disable-next-line rulesdir/prefer-onyx-connect-in-libs
         this.activeConnectionIDs[key] = _Onyx__WEBPACK_IMPORTED_MODULE_4__["default"].connect({