@oracle/oraclejet 20.1.2 → 20.1.3

package/dist/js/libs/oj/debug/ojmodulerouter-adapter.js

@@ -51,6 +51,15 @@ define(['ojs/ojlogger', 'ojs/ojmodule-element-utils', 'ojs/ojmoduleanimations',
    *      animationCallback: animationCallback
    *    }
    * );
+   *
+   * // For RegExp routes that should load a fixed module, use pathKey to load an
+   * // explicit module name from route detail.
+   * var regexRouter = new CoreRouter([
+   *   { path: /order-[0-9]+/, detail: { module: 'orders/detail' } }
+   * ]);
+   * var regexAdapter = new ModuleRouterAdapter(regexRouter, {
+   *   pathKey: 'module'
+   * });
    * </code>
    * </pre>
    * @param {CoreRouter} router The instance of the CoreRouter, that manages application navigation for a page or a section of the page.
@@ -60,10 +69,17 @@ define(['ojs/ojlogger', 'ojs/ojmodule-element-utils', 'ojs/ojmoduleanimations',
    *                  the default path will be used - 'views/'.
    * @param {string=} options.viewModelPath The path to the model, relative to the RequireJS baseURL.
    *                  If the option is not provided the default path wil be used - 'viewModels/'.
-   * @param {string=} options.pathKey An optional key for retrieving module name from 'details' object on the router state.
+   * @param {string=} options.pathKey An optional key for retrieving module name from the 'detail' object on the router state.
    *                  By default the adapter will use the 'path' field of the router state as the name for the module.
-   *                  However when 'path' does not represent the name of the module, the name can be retrieved from 'details' object
-   *                  on the router state using specified pathKey.
+   *                  However when 'path' does not represent the name of the module, the name can be retrieved from the 'detail' object
+   *                  on the router state using specified pathKey. Blank module names produce an empty module configuration.
+   *                  Non-blank module names must be relative module identifiers made from nonempty slash-separated
+   *                  segments containing only ASCII letters, digits, <code>_</code>, <code>.</code>, and <code>-</code>,
+   *                  such as <code>dashboard</code> or <code>orders/detail</code>. A leading <code>./</code>,
+   *                  empty segments, <code>.</code> or <code>..</code> segments, backslashes, absolute paths, URL
+   *                  schemes, and traversal patterns are not supported. When a
+   *                  RegExp, catch-all, URL-derived, or user-controlled route path should not itself be the module
+   *                  name, use this option to map the matched route to an explicit allowed module name instead.
    * @param {Function=} options.require An optional instance of the require() function to be used
    *                  for loading the view and view model. By default the path is relative to the baseUrl
    *                  specified for the application require calls.
@@ -172,6 +188,17 @@ define(['ojs/ojlogger', 'ojs/ojmodule-element-utils', 'ojs/ojmoduleanimations',
       return _options.pathKey ? state.detail[_options.pathKey] : state.path;
     }
 
+    function isValidModulePath(modulePath) {
+      if (typeof modulePath !== 'string') {
+        return false;
+      }
+      return modulePath.split('/').every(function (segment) {
+        return (
+          segment !== '' && segment !== '.' && segment !== '..' && /^[A-Za-z0-9_.-]+$/.test(segment)
+        );
+      });
+    }
+
     // before state change handler
     function onBeforeStateChange(args) {
       // canExit must return a Promise resolution or rejection
@@ -185,32 +212,36 @@ define(['ojs/ojlogger', 'ojs/ojmodule-element-utils', 'ojs/ojmoduleanimations',
       var configPromise;
       var modulePath = getModulePathFromState(args ? args.state : null);
       if (modulePath) {
-        var currentModulePath = getModulePathFromState(_currentState);
-        // check if model path didn't change and we can just re-apply the parameters
-        // using parametersChanged() callback
-        if (
-          modulePath === currentModulePath &&
-          _moduleConfig().viewModel &&
-          _moduleConfig().viewModel.parametersChanged
-        ) {
-          _moduleConfig().viewModel.parametersChanged(args.state.params);
-          _currentState = args.state;
-          return;
-        }
-
-        var viewPath = _options.viewPath || 'views/';
-        var viewModelPath = _options.viewModelPath || 'viewModels/';
-        configPromise = ModuleUtils.createConfig({
-          require: _options.require,
-          viewPath: viewPath + modulePath + '.html',
-          viewModelPath: viewModelPath + modulePath,
-          params: {
-            parentRouter: _router,
-            params: args.state.params,
-            router: _router,
-            routerState: args.state
+        if (!isValidModulePath(modulePath)) {
+          configPromise = Promise.reject(new Error('Invalid module path'));
+        } else {
+          var currentModulePath = getModulePathFromState(_currentState);
+          // check if model path didn't change and we can just re-apply the parameters
+          // using parametersChanged() callback
+          if (
+            modulePath === currentModulePath &&
+            _moduleConfig().viewModel &&
+            _moduleConfig().viewModel.parametersChanged
+          ) {
+            _moduleConfig().viewModel.parametersChanged(args.state.params);
+            _currentState = args.state;
+            return;
           }
-        });
+
+          var viewPath = _options.viewPath || 'views/';
+          var viewModelPath = _options.viewModelPath || 'viewModels/';
+          configPromise = ModuleUtils.createConfig({
+            require: _options.require,
+            viewPath: viewPath + modulePath + '.html',
+            viewModelPath: viewModelPath + modulePath,
+            params: {
+              parentRouter: _router,
+              params: args.state.params,
+              router: _router,
+              routerState: args.state
+            }
+          });
+        }
       } else {
         configPromise = Promise.resolve({ view: [], viewModel: null });
       }

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

@@ -340,6 +340,7 @@ var __oj_tab_bar_metadata =
   const _ARIA_LABEL = 'aria-label';
   const _ARIA_DESCRBIEDBY = 'aria-describedby';
   const _ARIA_HASPOPUP = 'aria-haspopup';
+  const _NOOPENER_WINDOW_FEATURES = 'noopener,noreferrer';
   const _OJ_DEFAULT = 'oj-default';
   const _OJ_DISABLED = 'oj-disabled';
 
@@ -2074,7 +2075,7 @@ var __oj_tab_bar_metadata =
           if (!target || target === '_self') {
             window.location.href = url;
           } else {
-            window.open(url, target);
+            window.open(url, target, _NOOPENER_WINDOW_FEATURES);
           }
 
           return true;
@@ -2940,6 +2941,18 @@ var __oj_tab_bar_metadata =
      *
      * <p>It is not recommended to use <code class="prettyprint">oj-navigation-list</code> only for the purpose of rendering links that navigate to a different page. Instead, each item that has a link should be interactive and activating it should display or switch a content panel within the same page or context.</p>
      *
+     * <h3 id="security-section">
+     *   Security
+     *   <a class="bookmarkable-link" title="Bookmarkable Link" href="#security-section"></a>
+     * </h3>
+     *
+     * <p><b>Note:</b> When item content includes an <code class="prettyprint">&lt;a></code> element with an
+     * <code class="prettyprint">href</code> attribute, JET validates the URL protocol before
+     * automatic navigation and currently supports <code class="prettyprint">http:</code> and
+     * <code class="prettyprint">https:</code> protocols. JET does not validate whether the URL
+     * is trusted for the application. Applications are responsible for providing sanitized URLs
+     * and enforcing any required origin or host allowlist.</p>
+     *
      * <h3 id="rtl-section">
      *   Reading direction
      *   <a class="bookmarkable-link" title="Bookmarkable Link" href="#rtl-section"></a>
@@ -4722,6 +4735,17 @@ var __oj_tab_bar_metadata =
    * </h3>
    * <p>It is not recommended to use <code class="prettyprint">oj-tab-bar</code> only for the purpose of rendering links that navigate to a different page. Instead, each item that has a link should be interactive and activating it should display or switch a content panel within the same page or context.</p>
    *
+   * <h3 id="security-section">
+   * Security
+   * <a class="bookmarkable-link" title="Bookmarkable Link" href="#security-section"></a>
+   * </h3>
+   * <p><b>Note:</b> When item content includes an <code class="prettyprint">&lt;a></code> element with an
+   * <code class="prettyprint">href</code> attribute, JET validates the URL protocol before
+   * automatic navigation and currently supports <code class="prettyprint">http:</code> and
+   * <code class="prettyprint">https:</code> protocols. JET does not validate whether the URL
+   * is trusted for the application. Applications are responsible for providing sanitized URLs
+   * and enforcing any required origin or host allowlist.</p>
+   *
    * <h3 id="migration-section">
    *   Migration
    *   <a class="bookmarkable-link" title="Bookmarkable Link" href="#migration-section"></a>

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

@@ -1530,6 +1530,13 @@ define(['ojs/ojcore', 'knockout', 'signals', 'ojs/ojlogger'], function(oj, ko, s
      * to specify a different module animation when going 'back'. The value of direction is either
      * undefined or 'back'. It is 'back' when the state transition is caused by a back button on the
      * browser and the new state is equal to the previous state.
+     * <p>
+     * The <code class="prettyprint">name</code> value can be derived from the browser URL when
+     * synchronizing router state. When using <code class="prettyprint">moduleConfig</code> with
+     * <code class="prettyprint">ojModule</code>, configure route states from a fixed allowlist or
+     * ensure that {@link oj.RouterState#value|RouterState.value} is a trusted module name. Do not
+     * reflect URL-derived state ids into module names without application validation.
+     * </p>
 
      * To customize the behavior of the moduleduleConfig object, it is possible to create your own
      * moduleConfig and merge other properties or modifies the value of existing properties.
@@ -2358,6 +2365,12 @@ define(['ojs/ojcore', 'knockout', 'signals', 'ojs/ojlogger'], function(oj, ko, s
   /**
    * Store additional data for this router that will be added in a compressed form to the URL
    * so it can be bookmarked. When calling this method, the URL is immediately modified.
+   * <p>
+   * The data is encoded into the browser URL and can be modified by a user before the
+   * application later retrieves it. Do not store sensitive values, and validate the
+   * retrieved value against the application's expected schema before using it in security
+   * decisions, module selection, URL construction, or DOM/CSS sinks.
+   * </p>
    * @param {!Object} data the data to store with this state.
    * @throws An error if the bookmarkable state is too big.
    * @return {undefined}
@@ -2367,7 +2380,9 @@ define(['ojs/ojcore', 'knockout', 'signals', 'ojs/ojlogger'], function(oj, ko, s
    * try {
    *    var color = '#99CCFF';
    *    router.store(color);
-   *    $('#chapter').css('background', color);
+   *    if (/^#[0-9A-Fa-f]{6}$/.test(color)) {
+   *      $('#chapter').css('background', color);
+   *    }
    * }
    * catch (error) {
    *    Logger.error('Error while storing data: ' + error.message);
@@ -2411,6 +2426,11 @@ define(['ojs/ojcore', 'knockout', 'signals', 'ojs/ojlogger'], function(oj, ko, s
 
   /**
    * Retrieve the additional data stored in the URL.
+   * <p>
+   * The returned value comes from bookmarkable state encoded in the browser URL. Treat it as
+   * user-modifiable input and validate it against the application's expected schema before
+   * using it in security decisions, module selection, URL construction, or DOM/CSS sinks.
+   * </p>
    * @return {any} the content stored in the URL
    * @ojsignature [{ target: "Type", for: "returns", value: "{[key:string]:any}" }]
    * @export
@@ -2418,7 +2438,7 @@ define(['ojs/ojcore', 'knockout', 'signals', 'ojs/ojlogger'], function(oj, ko, s
    *  oj.Router.sync().then(
    *     function() {
    *        var color = viewModel.router.retrieve();
-   *        if (color) {
+   *        if (typeof color === 'string' && /^#[0-9A-Fa-f]{6}$/.test(color)) {
    *           $('#chapter').css('background', color);
    *        }
    *     },
@@ -2680,7 +2700,7 @@ define(['ojs/ojcore', 'knockout', 'signals', 'ojs/ojlogger'], function(oj, ko, s
    *  oj.Router.sync().then(
    *     function() {
    *        var color = viewModel.router.retrieve();
-   *        if (color) {
+   *        if (typeof color === 'string' && /^#[0-9A-Fa-f]{6}$/.test(color)) {
    *           $('#chapter').css('background', color);
    *        }
    *     },

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

@@ -5,8 +5,9 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-define(['exports'], function (exports) { 'use strict';
+define(['exports', 'ojs/ojdomutils'], function (exports, ojdomutils) { 'use strict';
 
+    const ALLOWED_AUDIO_URL_PROTOCOLS = ['http:', 'https:', 'data:', 'blob:'];
     /**
      * @classdesc
      * A utility class with helpers to play audio
@@ -39,12 +40,20 @@ define(['exports'], function (exports) { 'use strict';
          * @returns {Promise<void, Error>} A promise that resolves when the audio is play or rejects if there are any issues
          */
         static playAudioFromURL(url) {
-            let resolve;
-            let reject;
+            let resolve = () => { };
+            let reject = () => { };
             const returnPromise = new Promise((_resolve, _reject) => {
                 resolve = _resolve;
                 reject = _reject;
             });
+            try {
+                ojdomutils.validateURL(url, ALLOWED_AUDIO_URL_PROTOCOLS);
+            }
+            catch (error) {
+                // Defer so callers can attach a rejection handler to the returned promise first.
+                void Promise.resolve().then(() => reject(error));
+                return returnPromise;
+            }
             // Using an <audio> element is simple for our use case.
             const audioElement = document.createElement('audio');
             audioElement.src = url;

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

@@ -5315,12 +5315,9 @@ var __oj_table_metadata =
       idleTimeout = null;
     }, 250);
 
-    // Chromium has an issue with requestIdleCallback when mouse wheel is used, see Chrome :
-    // https://bugs.chromium.org/p/chromium/issues/detail?id=822269
-    var options;
-    if (isMouseWheel && DataCollectionUtils.isBlink()) {
-      options = { timeout: 100 };
-    }
+    // Use a timeout so fetch rendering is not blocked indefinitely when the browser
+    // does not get an idle period, including scrollbar and mouse wheel scrolling.
+    var options = { timeout: 100 };
     this._idleCallback = window.requestIdleCallback(function (idleDeadline) {
       if (idleTimeout == null) {
         return;

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

@@ -175,6 +175,11 @@ define(['ojs/ojcore-base', 'ojs/ojcomponentcore', 'jquery', 'ojs/ojdvt-base', 'o
    * @property {Object=} svgStyle The CSS style object defining the style of the item text. Only SVG CSS style properties are supported. The default value comes from the CSS and varies based on theme.
    * @property {string=} svgClassName The CSS style class defining the style of the item text.
    * @property {string=} url The url this item references.
+   * <p><b>Note:</b> For security, JET validates the URL protocol before navigation and
+   * currently supports <code class="prettyprint">http:</code>
+   * and <code class="prettyprint">https:</code> protocols. JET does not validate whether the
+   * URL is trusted for the application. Applications are responsible for providing sanitized
+   * URLs and enforcing any required origin or host allowlist.</p>
    * @property {number} value The value of this item which will be used to scale its font-size within the tag cloud.
    * @ojdeprecated {since: '15.0.0', description: 'This is not recommended in the Redwood design system.', target: 'property', for: 'svgStyle'}
    *
@@ -517,6 +522,11 @@ define(['ojs/ojcore-base', 'ojs/ojcomponentcore', 'jquery', 'ojs/ojdvt-base', 'o
    */
   /**
    * The url this item references.
+   * <p><b>Note:</b> For security, JET validates the URL protocol before navigation and
+   * currently supports <code class="prettyprint">http:</code> and
+   * <code class="prettyprint">https:</code> protocols. JET does not validate whether the
+   * URL is trusted for the application. Applications are responsible for providing
+   * sanitized URLs and enforcing any required origin or host allowlist.</p>
    * @expose
    * @name url
    * @memberof! oj.ojTagCloudItem

package/dist/js/libs/oj/debug/ojtemplateengine-ko.js

@@ -5,13 +5,16 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-define(['knockout', 'ojs/ojkoshared', 'ojs/ojtemplateengine-utils', 'ojs/ojcore', 'ojs/ojhtmlutils', 'ojs/ojcustomelement-utils', 'ojs/ojcontext', 'ojs/ojlogger'], function (ko, BindingProviderImpl, ojtemplateengineUtils, oj, HtmlUtils, ojcustomelementUtils, Context, Logger) { 'use strict';
+define(['knockout', 'ojs/ojkoshared', 'ojs/ojtemplateengine-utils', 'ojs/ojcore', 'ojs/ojhtmlutils', 'ojs/ojcustomelement-utils', 'ojs/ojlogger', 'ojs/ojcontext'], function (ko, BindingProviderImpl, ojtemplateengineUtils, oj, HtmlUtils, ojcustomelementUtils, Logger, Context) { 'use strict';
 
     BindingProviderImpl = BindingProviderImpl && Object.prototype.hasOwnProperty.call(BindingProviderImpl, 'default') ? BindingProviderImpl['default'] : BindingProviderImpl;
     oj = oj && Object.prototype.hasOwnProperty.call(oj, 'default') ? oj['default'] : oj;
     Context = Context && Object.prototype.hasOwnProperty.call(Context, 'default') ? Context['default'] : Context;
 
     const _propertyContribsCache = new WeakMap();
+    function _getBlockedPropertyToken(tokens) {
+        return tokens.find((token) => oj.CollectionUtils._isBlockedKey(token));
+    }
     class TemplateEngineKoInternal {
         constructor() {
             this._bindingProvider = {
@@ -85,6 +88,9 @@ define(['knockout', 'ojs/ojkoshared', 'ojs/ojtemplateengine-utils', 'ojs/ojcore'
                 // Handle the 'dot' notation for bound subprops
                 var propTokens = prop.split('.');
                 if (propertySet.has(propTokens[0])) {
+                    if (this._shouldSkipPropertyPath(propTokens)) {
+                        continue;
+                    }
                     var info = ojcustomelementUtils.AttributeUtils.getExpressionInfo(attr.value);
                     var expr = info.expr;
                     if (expr) {
@@ -121,6 +127,9 @@ define(['knockout', 'ojs/ojkoshared', 'ojs/ojtemplateengine-utils', 'ojs/ojcore'
             const computed = ko.pureComputed(() => {
                 const boundValues = {};
                 contribs.evalMap.forEach((evaluator, tokens) => {
+                    if (this._shouldSkipPropertyPath(tokens)) {
+                        return;
+                    }
                     var leafValue = ko.utils.unwrapObservable(evaluator(context));
                     if (propertyValidator) {
                         propertyValidator(tokens, leafValue);
@@ -150,6 +159,14 @@ define(['knockout', 'ojs/ojkoshared', 'ojs/ojtemplateengine-utils', 'ojs/ojcore'
             current[tokens[lastIndex]] = value;
             return complexVal;
         }
+        _shouldSkipPropertyPath(tokens) {
+            const blockedToken = _getBlockedPropertyToken(tokens);
+            if (blockedToken) {
+                Logger.warn(`Skipping template property path "${tokens.join('.')}" because it contains unsupported key "${blockedToken}".`);
+                return true;
+            }
+            return false;
+        }
         /**
          *
          * @param delegate

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

@@ -33,7 +33,7 @@ define(function () { 'use strict';
       .forEach(function (key) {
         var value = params[key];
         if (value !== undefined && value !== null) {
-          paramArray.push(';' + key + '=' + encode(value));
+          paramArray.push(';' + encode(key) + '=' + encode(value));
         }
       });
     return paramArray.join('');
@@ -56,7 +56,7 @@ define(function () { 'use strict';
     parts.forEach(function (part) {
       if (part) {
         var pair = part.split('=');
-        parsed.params[pair[0]] = decode(pair[1]);
+        parsed.params[decode(pair[0])] = decode(pair[1]);
       }
     });
     return parsed;

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

@@ -16,6 +16,28 @@ var __decorate = (null && null.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+const encodeCssUrlControlCharacter = (char) => {
+    const hex = char.charCodeAt(0).toString(16).toUpperCase();
+    return `%${hex.length < 2 ? '0' + hex : hex}`;
+};
+const escapeCssUrlString = (url) => {
+    let escapedUrl = '';
+    for (let i = 0; i < url.length; i++) {
+        const char = url.charAt(i);
+        const charCode = char.charCodeAt(0);
+        if (char === '"' || char === '\\') {
+            escapedUrl += `\\${char}`;
+        }
+        else if (charCode <= 0x1f || charCode === 0x7f) {
+            escapedUrl += encodeCssUrlControlCharacter(char);
+        }
+        else {
+            escapedUrl += char;
+        }
+    }
+    return escapedUrl;
+};
+const getCssUrl = (url) => `url("${escapeCssUrlString(url)}")`;
 /**
  * @classdesc
  * <h3 id="avatarOverview-section">
@@ -301,7 +323,7 @@ let Avatar = class Avatar extends Component {
     }
     _getInnerContent(props) {
         if (props.src && !props.iconClass) {
-            return (jsx("div", { class: "oj-avatar-background-image", style: { backgroundImage: `url("${props.src}")` } }));
+            return (jsx("div", { class: "oj-avatar-background-image", style: { backgroundImage: getCssUrl(props.src) } }));
         }
         else {
             return jsx("div", { class: "oj-avatar-background oj-avatar-background-image" });

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

@@ -625,9 +625,13 @@ var __oj_color_palette_metadata =
    * it shows all the time.
    * </p>
    * <p>
-   * For security reasons we only support urls with protocol 'http:' or 'https:'.
-   * If the url doesn't comply we ignore it and throw an error.
-   * Pass in an encoded URL since we do not encode the URL.</p>
+   * <p><b>Note:</b> For security, JET validates the URL protocol before navigation and
+   * currently supports <code class="prettyprint">http:</code> and
+   * <code class="prettyprint">https:</code> protocols. If the url doesn't
+   * comply we ignore it and throw an error. JET does not validate whether
+   * the URL is trusted for the application. Applications are responsible
+   * for providing sanitized URLs and enforcing any required origin or host
+   * allowlist. Pass in an encoded URL since we do not encode the URL.</p>
    *
    * <p>See the <a href="#helpHints">help-hints</a> attribute for usage examples.</p>
    *
@@ -673,6 +677,8 @@ var __oj_color_palette_metadata =
    * <p>
    * To include formatted text in the help.instruction, format the string using html tags.
    * The allowed html tags are: span, b, i, em, br, hr, li, ol, ul, p, small, pre.
+   * Inline style attributes are sanitized; the retained styling is limited to color, font
+   * style, font weight, and text decoration. Use CSS classes for other styling.
    * For example the
    * help.instruction might look like:
    * <pre class="prettyprint"><code>&lt;oj-some-element help.instruction="&lt;html>Enter &lt;b>at least&lt;/b> 6 characters&lt;/html>">&lt;/oj-some-element></code></pre>
@@ -803,6 +809,8 @@ var __oj_color_palette_metadata =
    * hints and message summary text cannot. If you use formatted text, it should be accessible
    * and make sense to the user if formatting wasn't there.
    * The allowed html tags are: span, b, i, em, br, hr, li, ol, ul, p, small, pre.
+   * Inline style attributes are sanitized; the retained styling is limited to color, font
+   * style, font weight, and text decoration. Use CSS classes for other styling.
    * To format the message detail, you could do this:
    * <pre class="prettyprint"><code>&lt;html>Enter &lt;b>at least&lt;/b> 6 characters&lt;/html></code></pre>
    * </p>
@@ -2005,7 +2013,7 @@ var __oj_color_palette_metadata =
         );
 
       if (label) {
-        entry.append($("<span class='oj-colorpalette-swatch-text'>" + label + '</span>')[0]); // @HTMLUpdateOK
+        entry.append($("<span class='oj-colorpalette-swatch-text'></span>").text(label)[0]); // @HTMLUpdateOK
       }
       return entry[0];
     },
@@ -2023,30 +2031,23 @@ var __oj_color_palette_metadata =
      * @private
      */
     _renderNone: function (showLabels, label, tooltip, swatchClass, selectedClass) {
-      var raw;
-
-      raw =
-        "<div class='oj-colorpalette-swatch-entry " +
-        swatchClass +
-        (showLabels ? ' oj-colorpalette-swatch-showlabel' : '') +
-        "'>" +
-        "<div class='oj-colorpalette-swatch-container'>" +
-        "<div class='oj-colorpalette-swatch " +
-        selectedClass +
-        "'" +
-        (!label ? " title='" + tooltip + "'" : '') +
-        (!label ? " aria-label='" + tooltip + "'" : '') +
-        '>' +
-        "<div class='oj-colorpalette-swatch-none-icon'>" +
-        '</div>' +
-        '</div>' +
-        '</div>';
+      // prettier-ignore
+      var entry = $("<div class='oj-colorpalette-swatch-entry'></div>")
+        .addClass(swatchClass + (showLabels ? ' oj-colorpalette-swatch-showlabel' : ''))
+        .append( // @HTMLUpdateOK
+          $("<div class='oj-colorpalette-swatch-container'></div>").append( // @HTMLUpdateOK
+            $("<div class='oj-colorpalette-swatch'></div>")
+              .attr('title', !label ? tooltip : null)
+              .attr('aria-label', !label ? tooltip : null)
+              .addClass(selectedClass)
+              .append($("<div class='oj-colorpalette-swatch-none-icon'></div>")) // @HTMLUpdateOK
+          )
+        );
 
       if (label) {
-        raw += "<span class='oj-colorpalette-swatch-text'>" + label + '</span>';
+        entry.append($("<span class='oj-colorpalette-swatch-text'></span>").text(label)[0]); // @HTMLUpdateOK
       }
-      raw += '</div>';
-      return $(raw)[0];
+      return entry[0];
     },
 
     /**

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

@@ -2503,6 +2503,10 @@ oj.CollectionUtils.copyInto(CustomElementBridge.proto, {
     };
     // eslint-disable-next-line no-param-reassign
     proto.getProperty = function (prop) {
+      if (oj.BaseCustomElementBridge.__IsBlockedPropertyPath(prop)) {
+        return undefined;
+      }
+
       var bridge = CustomElementUtils.getElementBridge(this);
       var meta = getPropertyMetadata(prop, getElementProperties(this));
 
@@ -6465,38 +6469,40 @@ function _mergeObjectsWithExclusions(target, input, ignoreSubkeys, basePath, avo
     var keys = Object.keys(source);
     for (var i = 0; i < keys.length; i++) {
       var key = keys[i];
-      var path;
-      if (ignoreSubkeys == null) {
-        path = null;
-      } else if (basePath == null) {
-        path = key;
-      } else {
-        path = basePath + '.' + key;
-      }
-      // Ignore all sources when the current path is registered in ignoreSubkeys
-      if (ignoreSubkeys == null || !ignoreSubkeys[path]) {
-        var value = source[key];
-        if (value !== undefined) {
-          if ($.isPlainObject(value)) {
-            const plainObjectTarget = $.isPlainObject(target[key]);
-            // If merging an object onto a non-object and avoidClones is set, just replace target with value
-            if (!plainObjectTarget && avoidClones) {
-              // eslint-disable-next-line no-param-reassign
-              target[key] = value;
+      if (!oj.CollectionUtils._isBlockedKey(key)) {
+        var path;
+        if (ignoreSubkeys == null) {
+          path = null;
+        } else if (basePath == null) {
+          path = key;
+        } else {
+          path = basePath + '.' + key;
+        }
+        // Ignore all sources when the current path is registered in ignoreSubkeys
+        if (ignoreSubkeys == null || !ignoreSubkeys[path]) {
+          var value = source[key];
+          if (value !== undefined) {
+            if ($.isPlainObject(value)) {
+              const plainObjectTarget = $.isPlainObject(target[key]);
+              // If merging an object onto a non-object and avoidClones is set, just replace target with value
+              if (!plainObjectTarget && avoidClones) {
+                // eslint-disable-next-line no-param-reassign
+                target[key] = value;
+              } else {
+                var params = plainObjectTarget ? [target[key], value] : [value];
+                // eslint-disable-next-line no-param-reassign
+                target[key] = _mergeObjectsWithExclusions(
+                  {},
+                  params,
+                  ignoreSubkeys,
+                  path,
+                  avoidClones
+                );
+              }
             } else {
-              var params = plainObjectTarget ? [target[key], value] : [value];
               // eslint-disable-next-line no-param-reassign
-              target[key] = _mergeObjectsWithExclusions(
-                {},
-                params,
-                ignoreSubkeys,
-                path,
-                avoidClones
-              );
+              target[key] = value;
             }
-          } else {
-            // eslint-disable-next-line no-param-reassign
-            target[key] = value;
           }
         }
       }

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

@@ -344,8 +344,8 @@ Config.getExpressionEvaluator = function () {
  * @ignore
  * @export
  * @memberof oj.Config
- * @since 20.1.2
- * @ojdeprecated {since: '20.1.2', description: 'This API is deprecated. Applications should use CSP-compliant expressions and evaluators.'}
+ * @since 20.0.6
+ * @ojdeprecated {since: '20.0.6', description: 'This API is deprecated. Applications should use CSP-compliant expressions and evaluators.'}
  */
 Config.getFallbackExpressionEvaluator = function () {
   return Config._fallbackExpressionEvaluator;
@@ -387,8 +387,8 @@ Config.setExpressionEvaluator = function (expressionEvaluator) {
  * @ojshortdesc Sets a fallback expression evaluator.
  * @export
  * @ojsignature {target:"Type", value: "{createGenericExpressionEvaluator: Function, createBindingExpressionEvaluator: Function, createReplacementEvaluatorForExtend: Function}", for: "fallbackExpressionEvaluator"}
- * @since 20.1.2
- * @ojdeprecated {since: '20.1.2', description: 'This API is deprecated. Applications should use CSP-compliant expressions and evaluators.'}
+ * @since 20.0.6
+ * @ojdeprecated {since: '20.0.6', description: 'This API is deprecated. Applications should use CSP-compliant expressions and evaluators.'}
  */
 Config.setFallbackExpressionEvaluator = function (fallbackExpressionEvaluator) {
   if (Config._fallbackExpressionEvaluator) {