@oracle/oraclejet 16.0.1 → 16.0.3

package/dist/js/libs/oj/debug/ojselectbase.js

@@ -22,7 +22,7 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
     // idSuffix, lovMainField, filterInputText, lovDropdown, liveRegion, enabled, readOnly, value,
     // getTranslatedStringFunc, addBusyStateFunc, showMainFieldFunc, setFilterFieldTextFunc,
     // setUiLoadingStateFunc, isValueForPlaceholderFunc, isShowValueInFilterFieldFunc,
-    // getFilterInputElemFunc}
+    // getFilterInputElemFunc, matchBy}
     this._minLength = 0;
 
     this._className = options.className;
@@ -46,6 +46,7 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
     this._isValueForPlaceholderFunc = options.isValueForPlaceholderFunc;
     this._isShowValueInFilterFieldFunc = options.isShowValueInFilterFieldFunc;
     this._getFilterInputElemFunc = options.getFilterInputElemFunc;
+    this._matchBy = options.matchBy;
 
     this._lastDataProviderPromise = null;
 
@@ -63,6 +64,10 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
     this._value = value;
   };
 
+  AbstractLovBase.prototype.setMatchBy = function (matchBy) {
+    this._matchBy = matchBy;
+  };
+
   AbstractLovBase.prototype.getFetchType = function () {
     return this._fetchType;
   };
@@ -464,6 +469,7 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
 
     var filterCriteria = null;
     if (term) {
+      var matchBy;
       if (this._dataProvider) {
         var filterCapability = this._dataProvider.getCapability('filter');
         if (!filterCapability || !filterCapability.textFilter) {
@@ -471,12 +477,43 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
             'Select: DataProvider does not support text filter.  ' +
               'Filtering results in dropdown may not work correctly.'
           );
+        } else if (this._matchBy) {
+          // JET-60725 - Add option to specify the matchBy behavior of the text filter
+          // Find the first matchBy behavior in the array that the data provider supports.
+          matchBy = this._matchBy.reduce((result, curr) => {
+            // if we've already found a supported matchBy, use it
+            if (result) {
+              return result;
+            }
+            // if we've encountered 'unknown' in the array, return it because it's always supported
+            if (curr === 'unknown') {
+              return curr;
+            }
+            // if we haven't found a supported matchBy yet, see if the current one is supported and
+            // return it if so; if not log a warning
+            if (curr) {
+              if (
+                filterCapability.textFilterMatching &&
+                filterCapability.textFilterMatching.matchBy &&
+                filterCapability.textFilterMatching.matchBy.indexOf(curr) > -1
+              ) {
+                return curr;
+              }
+              Logger.warn(
+                `Select: DataProvider does not support text filter "${curr}" matching.  ` +
+                  'Filtering results in dropdown may not work as expected.'
+              );
+            }
+            // if we haven't found a supported matchBy yet, return undefined and go on
+            return undefined;
+          }, null);
         }
       }
 
       // create filter using FilterFactory so that default local filtering will happen if
       // underlying DP doesn't support its own filtering
-      filterCriteria = oj.FilterFactory.getFilter({ filterDef: { text: term } });
+      var filterDef = matchBy ? { text: term, matchBy } : { text: term };
+      filterCriteria = oj.FilterFactory.getFilter({ filterDef });
     }
 
     var retPromise = new Promise(
@@ -2532,7 +2569,7 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
    * @since 8.0.0
    * @abstract
    * @hideconstructor
-   * @ojtsimport {module: "ojdataprovider", type: "AMD", imported: ["DataProvider"]}
+   * @ojtsimport {module: "ojdataprovider", type: "AMD", imported: ["DataProvider", "TextFilter"]}
    * @ojtsimport {module: "ojcommontypes", type: "AMD", importName: ["ojcommontypes"]}
    * @ojsignature [{
    *                target: "Type",
@@ -2873,7 +2910,38 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
        * @memberof oj.ojSelectBase
        * @ojfragment selectCommonLabelledBy
        */
-      labelledBy: null
+      labelledBy: null,
+
+      /**
+       * The list of text filter matching behaviors to use when fetching data filtered by a user's
+       * typed search text, in order of descending priority with the preferred behavior first.
+       * If the preferred behavior is not supported by the DataProvider, then the component will
+       * check the next behavior, and so on, until it finds one that is supported.
+       * If none of the specified behaviors are supported or if this property is not specified,
+       * then the behavior will effectively be "unknown".
+       *
+       * @example <caption>Initialize the Select with the <code class="prettyprint">match-by</code> attribute specified:</caption>
+       * &lt;oj-select-single match-by="[[matchByValue]]">&lt;/oj-select-single>
+       *
+       * @example <caption>Get or set the <code class="prettyprint">matchBy</code> property after initialization:</caption>
+       * // getter
+       * var matchByValue = mySelect.matchBy;
+       *
+       * // setter
+       * mySelect.matchBy = ["phrase", "fuzzy", "contains", "startsWith", "unknown"];
+       *
+       * @name matchBy
+       * @ojshortdesc The ordered list of text filter matching behaviors to use when filtering data.
+       * @expose
+       * @access public
+       * @instance
+       * @memberof oj.ojSelectBase
+       * @type {Array.<string>|null}
+       * @ojsignature {target: "Type", value: "Array<TextFilter<D>['matchBy']>|null", jsdocOverride: true}
+       * @default null
+       * @since 16.0.2
+       */
+      matchBy: null
     },
 
     /**
@@ -3112,6 +3180,12 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
 
       var options = this.options;
 
+      // JET-60725 - Add option to specify the matchBy behavior of the text filter
+      // Make a copy of the array to use internally so that the application can't mutate it;
+      // they have to set a new array if they want to change it.
+      this._matchBy =
+        options.matchBy && options.matchBy.length > 0 ? [...options.matchBy] : undefined;
+
       this._wrapDataProviderIfNeeded(options.data);
       this._addDataProviderEventListeners();
 
@@ -3251,7 +3325,8 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
         setUiLoadingStateFunc: this._setUiLoadingState.bind(this),
         isValueForPlaceholderFunc: this._IsValueForPlaceholder.bind(this),
         isShowValueInFilterFieldFunc: this._IsShowValueInFilterField.bind(this),
-        getFilterInputElemFunc: this._getFilterInputElem.bind(this)
+        getFilterInputElemFunc: this._getFilterInputElem.bind(this),
+        matchBy: this._matchBy
       });
       this._abstractLovBase = abstractLovBase;
 
@@ -4279,6 +4354,16 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
       oj.Assert.failedInAbstractFunction();
     },
 
+    /**
+     * Called when the filter field is blurred.
+     * @memberof! oj.ojSelectBase
+     * @instance
+     * @protected
+     */
+    _HandleFilterFieldBlur: function () {
+      oj.Assert.failedInAbstractFunction();
+    },
+
     /**
      * @memberof! oj.ojSelectBase
      * @instance
@@ -4512,6 +4597,11 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
             var focusInFilterField =
               document.activeElement && DomUtils.isAncestor(filterInputText, document.activeElement);
             if (!focusInDropdown && !this._mousedownOnDropdown && !focusInFilterField) {
+              // JET-65757 - Empty value rejected when not confirmed by Enter/Tab
+              // clear the value after deleting all the filter text and clicking outside the
+              // component
+              this._HandleFilterFieldBlur();
+
               this._showMainField();
             }
           }
@@ -5037,7 +5127,15 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
         }
       }
 
-      this._super(key, value, flags);
+      // JET-64632 - DataProvider refresh event can wipe out currently selected value
+      // If we get a DP refresh event we may re-set the currently selected value so that we fetch
+      // new data for it, in which case we don't want to fire a change event, so don't call the
+      // superclass.
+      var bSkipSuperclassCall = key === 'value' && this.options.value === value;
+
+      if (!bSkipSuperclassCall) {
+        this._super(key, value, flags);
+      }
 
       // In vdom architecture, there are multiple issues with value and valueItem property that we need to
       // handle.
@@ -5222,6 +5320,14 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
         // JET-45922 - timing issue with select-single: lov drop-down doesn't have element
         // do a granular update if item-text changes instead of a general refresh
         this._UpdateItemText();
+      } else if (key === 'matchBy') {
+        // JET-60725 - Add option to specify the matchBy behavior of the text filter
+        // Make a copy of the array to use internally so that the application can't mutate it;
+        // they have to set a new array if they want to change it.
+        this._matchBy = value && value.length > 0 ? [...value] : undefined;
+        if (this._abstractLovBase) {
+          this._abstractLovBase.setMatchBy(this._matchBy);
+        }
       }
     },
 

package/dist/js/libs/oj/debug/ojselectsingle.js

@@ -90,6 +90,9 @@ var __oj_select_single_metadata =
     "labelledBy": {
       "type": "string"
     },
+    "matchBy": {
+      "type": "Array<string>"
+    },
     "messagesCustom": {
       "type": "Array<Object>",
       "writeback": true,
@@ -818,7 +821,11 @@ var __oj_select_single_metadata =
      * @override
      */
     _ReleaseSelectResources: function (shouldRetainMainFieldElem) {
+      this._bReleasingSelectResources = true;
+
       this._super(shouldRetainMainFieldElem);
+
+      this._bReleasingSelectResources = false;
     },
 
     /**
@@ -881,6 +888,34 @@ var __oj_select_single_metadata =
       this._handleSelection(this._GetDefaultValueItemForPlaceholder());
     },
 
+    /**
+     * Called when the filter field is blurred.
+     * @memberof! oj.ojSelectSingle
+     * @instance
+     * @protected
+     * @override
+     */
+    _HandleFilterFieldBlur: function () {
+      // JET-65757 - Empty value rejected when not confirmed by Enter/Tab
+      // clear the value after deleting all the filter text and clicking outside the
+      // component;
+      // check whether placeholder valueItem is already set so that we don't trigger
+      // validation unnecessarily
+      if (
+        !this._fullScreenPopup &&
+        !this._bReleasingSelectResources &&
+        this._IsFilterInputTextCleared()
+      ) {
+        if (
+          !this._IsValueForPlaceholder(this.options.value) ||
+          !this._IsValueItemForPlaceholder(this.options.valueItem)
+        ) {
+          // on desktop, if the user clears all the text and clicks out, clear the LOV value
+          this._handleSelection(this._defaultValueItemForPlaceholder, null, true);
+        }
+      }
+    },
+
     /**
      * @memberof! oj.ojSelectSingle
      * @instance
@@ -1560,6 +1595,7 @@ var __oj_select_single_metadata =
       }
 
       var newVal = this.options.value;
+      var origVal = this.options.value;
       if (event.type === 'mutate') {
         if (event.detail.remove != null) {
           var keys = event.detail.remove.keys;
@@ -1575,18 +1611,41 @@ var __oj_select_single_metadata =
         }
       }
 
-      // JET-42413: set flag while we're processing a value change so that if an app makes
-      // changes to the component from within the change listener, we can defer processing the
-      // new change until after we're done processing the current change
-      var resolveValueChangeFunc = this._StartMakingInternalValueChange();
+      var resolveBusyState = this._AddBusyState('ojSelectSingle processing DataProvider event');
+
+      // JET-64632 - DataProvider refresh event can wipe out currently selected value
+      // defer handling the event until the throttle promise (which is hooked into JET's Knockout
+      // throttling timeout) resolves so that we can correctly handle the case where we get both a
+      // new value set and a DP event
+      var throttlePromise = this._GetThrottlePromise();
+      throttlePromise.then(
+        function () {
+          // if the component was released before the promise resolved, simply resolve the busy
+          // state and return
+          if (this._bReleasedResources) {
+            resolveBusyState();
+            return;
+          }
 
-      // if the event wasn't dispatched internally, need to re-set the value now that the label may
-      // be available, or because a mutation event removed a selected value
-      this._setOption('value', newVal);
+          // if the event wasn't dispatched internally, and if the value has not been changed since
+          // the event was received, need to re-set the value now that the label may be available,
+          // or because a mutation event removed a selected value
+          if (origVal === this.options.value) {
+            // JET-42413: set flag while we're processing a value change so that if an app makes
+            // changes to the component from within the change listener, we can defer processing the
+            // new change until after we're done processing the current change
+            var resolveValueChangeFunc = this._StartMakingInternalValueChange();
 
-      resolveValueChangeFunc();
+            this._setOption('value', newVal);
+
+            resolveValueChangeFunc();
+          }
 
-      this._abstractLovBase.handleDataProviderEvent(event);
+          this._abstractLovBase.handleDataProviderEvent(event);
+
+          resolveBusyState();
+        }.bind(this)
+      );
     },
 
     /**

package/dist/js/libs/oj/debug_esm/ojbufferingdataprovider.js

@@ -709,8 +709,7 @@ class BufferingDataProvider {
                 this._baseIterator = _baseIterator;
                 this._params = _params;
                 this.firstBaseKey = null;
-                this.mergedAddKeySet = new Set();
-                this.unFetchedAddItemSet = new Set();
+                this.mergedAddKeySet = new MutableKeySet();
                 this.mergedItemArray = [];
                 this.nextOffset = 0;
                 if (this._params == null) {
@@ -767,16 +766,11 @@ class BufferingDataProvider {
                         }
                         const newDataArray = [];
                         const newMetaArray = [];
-                        this.unFetchedAddItemSet.forEach((item) => {
-                            newDataArray.push(item.data);
-                            newMetaArray.push(item.metadata);
-                        });
-                        this.unFetchedAddItemSet.clear();
                         let idx;
                         for (idx = this.nextOffset; idx < this.mergedItemArray.length; idx++) {
-                            ++this.nextOffset;
                             const item = this.mergedItemArray[idx];
                             if (!this._parent._isItemRemoved(item.metadata.key)) {
+                                this.nextOffset = idx + 1;
                                 newDataArray.push(item.data);
                                 newMetaArray.push(item.metadata);
                                 if (params.size && newDataArray.length === params.size) {
@@ -987,7 +981,7 @@ class BufferingDataProvider {
                     else {
                         sortCriteria = params.sortCriteria;
                     }
-                    this._mergeEdits(baseItemArray, newItemArray, params.filterCriterion, sortCriteria, new Set(), baseResults.done);
+                    this._mergeEdits(baseItemArray, newItemArray, params.filterCriterion, sortCriteria, new MutableKeySet(), baseResults.done);
                     let actualReturnSize = newItemArray.length;
                     for (const newItem of newItemArray) {
                         if (this._isItemRemoved(newItem.metadata.key)) {
@@ -1150,9 +1144,13 @@ class BufferingDataProvider {
             }
             else {
                 addBeforeKey = this.lastIterator.firstBaseKey;
+                let shouldIncrementNextOffset = this.lastIterator.nextOffset !== 0;
                 if (this.editBuffer.isUpdateTransformed(item.metadata.key)) {
                     for (let i = 0; i < this.lastIterator.mergedItemArray.length; i++) {
-                        if (this.lastIterator.mergedItemArray[i].metadata.key === item.metadata.key) {
+                        if (oj.KeyUtils.equals(this.lastIterator.mergedItemArray[i].metadata.key, item.metadata.key)) {
+                            if (shouldIncrementNextOffset) {
+                                shouldIncrementNextOffset = this.lastIterator.nextOffset <= i;
+                            }
                             this.lastIterator.mergedItemArray.splice(i, 1);
                             break;
                         }
@@ -1160,11 +1158,10 @@ class BufferingDataProvider {
                 }
                 this.lastIterator.mergedItemArray.splice(0, 0, item);
                 this.lastIterator.mergedAddKeySet.add(item.metadata.key);
-                if (addBeforeKey === null) {
-                    this.lastIterator.unFetchedAddItemSet.add(item);
-                }
                 this.lastIterator.firstBaseKey = item.metadata.key;
-                this.lastIterator.nextOffset++;
+                if (shouldIncrementNextOffset) {
+                    this.lastIterator.nextOffset++;
+                }
             }
         }
         return addBeforeKey;
@@ -1219,14 +1216,13 @@ class BufferingDataProvider {
                 if (fromBaseDP || mergedAddKeySet.has(key)) {
                     mergedItemArray.splice(keyIdx, 1);
                     mergedAddKeySet.delete(key);
-                    if (keyIdx < this.lastIterator.nextOffset) {
-                        --this.lastIterator.nextOffset;
-                    }
                 }
-                else {
-                    if (keyIdx === this.lastIterator.nextOffset - 1) {
-                        --this.lastIterator.nextOffset;
+                for (let i = this.lastIterator.nextOffset - 1; i >= 0; i--) {
+                    let itemKey = mergedItemArray[i]?.metadata.key;
+                    if (itemKey != null && !this._isItemRemoved(itemKey)) {
+                        break;
                     }
+                    this.lastIterator.nextOffset = i;
                 }
                 if (oj.KeyUtils.equals(this.lastIterator.firstBaseKey, key)) {
                     this.lastIterator.firstBaseKey = null;
@@ -1668,6 +1664,47 @@ class BufferingDataProvider {
 BufferingDataProvider._REFRESH = 'refresh';
 BufferingDataProvider._MUTATE = 'mutate';
 BufferingDataProvider._ADDEVENTLISTENER = 'addEventListener';
+class MutableKeySet {
+    constructor() {
+        this.set = new Set();
+    }
+    has(key) {
+        return _has(this.set, key);
+    }
+    add(key) {
+        if (!_has(this.set, key)) {
+            this.set.add(key);
+        }
+    }
+    delete(key) {
+        const ret = _find(this.set, key);
+        if (ret.value) {
+            this.set.delete(ret.key);
+        }
+    }
+}
+const _has = (keys, keyToFind) => {
+    return _find(keys, keyToFind).value;
+};
+const _find = (keys, keyToFind) => {
+    if (keys.size === 0) {
+        return { value: false };
+    }
+    if (typeof keyToFind === 'string' ||
+        typeof keyToFind === 'number' ||
+        typeof keyToFind === 'boolean') {
+        return { value: keys.has(keyToFind), key: keyToFind };
+    }
+    const iterator = keys[Symbol.iterator]();
+    let key = iterator.next();
+    while (!key.done) {
+        if (oj.KeyUtils.equals(key.value, keyToFind)) {
+            return { value: true, key: key.value };
+        }
+        key = iterator.next();
+    }
+    return { value: false };
+};
 EventTargetMixin.applyMixin(BufferingDataProvider);
 oj._registerLegacyNamespaceProp('BufferingDataProvider', BufferingDataProvider);
 

package/dist/js/libs/oj/debug_esm/ojcore-base.js

@@ -37,12 +37,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '16.0.1',
+  version: '16.0.3',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2024-03-20_19-05-18',
+  revision: '2024-04-19_19-36-49',
 
   // This function is only meant to be used outside the library, so quoting the name
   // to avoid renaming is appropriate

package/dist/js/libs/oj/debug_esm/ojcorerouter.js

@@ -5,9 +5,9 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
+import { info } from 'ojs/ojlogger';
 import { BehaviorSubject } from 'ojs/ojobservable';
 import UrlPathAdapter from 'ojs/ojurlpathadapter';
-import { info } from 'ojs/ojlogger';
 
 /**
  * An interface describing the object used by {@link CoreRouter} to represent
@@ -79,9 +79,6 @@ let urlAdapter;
 // similar to how history-tracking routers use URL segments
 let noHistorySegments = [];
 
-// Pending transitions array to hold extra transitions passed to go()
-let pendingTransitions = [];
-
 /**
  * Test if two routes are equivalent. Routes are equivalent if they have the
  * same paths and parameter values.
@@ -564,36 +561,16 @@ CoreRouter.prototype._configure = function (routes = []) {
  * @ojsignature {target: "Type", value: "Promise<CoreRouter.CoreRouterState<D, P>>", for: "returns"}
  */
 CoreRouter.prototype.sync = function () {
-  let route;
-  if (pendingTransitions.length) {
-    // Use the pending transition as the new state to sync
-    const transition = pendingTransitions.shift();
-    const newRoutes = this._getParentRoutes().concat(this._getPendingState(transition));
-    const newPath = urlAdapter.getUrlForRoutes(newRoutes);
-    if (!this._noHistory) {
-      window.history.replaceState(null, 'path', newPath);
-    }
-    route = transition;
-  } else {
-    route = this._getRouteSegment();
-  }
-
   // Transition to the new route, or a default one if no current one exists
-  return this._execute(route || { path: '', params: {} })
-    .then((state) => {
-      // Synchronize the next child router
-      var p = state;
-      var childRouter = this.childRouter;
-      if (childRouter) {
-        p = childRouter.sync();
-      }
-      return p;
-    })
-    .catch((ex) => {
-      // Clear transitions if transition rejected
-      pendingTransitions = [];
-      throw ex;
-    });
+  return this._execute(this._getRouteSegment() || { path: '', params: {} }).then((state) => {
+    // Synchronize the next child router
+    var p = state;
+    var childRouter = this.childRouter;
+    if (childRouter) {
+      p = childRouter.sync();
+    }
+    return p;
+  });
 };
 
 /**
@@ -726,9 +703,6 @@ CoreRouter.prototype.go = function (...transitions) {
     const path = transitions.map((t) => t.path).join('/');
     info(`Navigating router(${this._name}) to ${path}`);
 
-    // Use first transition and store remaining for next child router to read
-    const first = transitions[0];
-
     // Get the current routes for all active routers, and compare that to the
     // new routes for this transition.
     const currentPath = urlAdapter.getUrlForRoutes(getActiveRoutes());
@@ -743,15 +717,18 @@ CoreRouter.prototype.go = function (...transitions) {
       // Cleanup noHistorySegments when navigating any history-tracking routers
       noHistorySegments = [];
       // Insert the new transitions after the current router's route offset
-      const newRoutes = this._getParentRoutes().concat(this._getPendingState(first, true));
+      const newRoutes = this._getParentRoutes().concat(
+        // only first transition is for this router
+        this._getPendingState(transitions[0]),
+        // remaining are for child routers
+        transitions.slice(1)
+      );
       const newPath = urlAdapter.getUrlForRoutes(newRoutes);
       if (currentPath !== newPath) {
         window.history.pushState(null, 'path', newPath);
       }
     }
     goP = this.sync().catch((ex) => {
-      // Clear transitions if transition rejected
-      pendingTransitions = [];
       if (this._noHistory) {
         noHistorySegments = prevNoHistorySegments;
       } else {
@@ -759,7 +736,6 @@ CoreRouter.prototype.go = function (...transitions) {
       }
       throw ex;
     });
-    pendingTransitions = transitions.slice(1);
   }
   return goP;
 };
@@ -847,10 +823,7 @@ CoreRouter.prototype._publish = function (state) {
  */
 CoreRouter.prototype._setupNavigationListener = function () {
   if (this === rootRouter) {
-    this._popstateHandler = () => {
-      pendingTransitions = [];
-      this.sync();
-    };
+    this._popstateHandler = () => this.sync();
     window.addEventListener('popstate', this._popstateHandler, false);
   }
 };
@@ -875,12 +848,10 @@ CoreRouter.prototype._isCurrentState = function (state) {
  * configured states. This CoreRouterState object will similar to the matched configured
  * state, except will have its own path and params values.
  * @param {CoreRouter.Route} transition The transition for the CoreRouterState
- * @param {boolean} createEmpty Create an empty state object for the transition,
- * even if a matching route doesn't exist.
  * @return {CoreRouter.RouterState} The CoreRouterState associated for the transition
  * @private
  */
-CoreRouter.prototype._getPendingState = function (transition, createEmpty) {
+CoreRouter.prototype._getPendingState = function (transition) {
   var pending;
   var path = transition.path;
   var params = transition.params || {};
@@ -899,13 +870,6 @@ CoreRouter.prototype._getPendingState = function (transition, createEmpty) {
       _match: match._match
     };
     Object.freeze(pending);
-  } else if (createEmpty) {
-    pending = {
-      path,
-      params: {},
-      detail: {},
-      pathParams: []
-    };
   }
   return pending;
 };
@@ -1029,6 +993,13 @@ CoreRouter.prototype.createChildRouter = function (routes, options = {}) {
  * @export
  */
 CoreRouter.prototype.destroy = function () {
+  if (this.childRouter) {
+    this.childRouter.destroy();
+  }
+
+  this.beforeStateChange.observers.forEach((subscription) => subscription());
+  this.currentState.observers.forEach((subscription) => subscription());
+
   if (this === rootRouter) {
     window.removeEventListener('popstate', this._popstateHandler, false);
     rootRouter = null;