@rjsf/utils 6.0.1 → 6.1.0

package/lib/schema/getDisplayLabel.js

@@ -1,4 +1,5 @@
-import { UI_FIELD_KEY, UI_WIDGET_KEY } from '../constants.js';
+import get from 'lodash-es/get.js';
+import { ADDITIONAL_PROPERTY_FLAG, UI_FIELD_KEY, UI_WIDGET_KEY } from '../constants.js';
 import getSchemaType from '../getSchemaType.js';
 import getUiOptions from '../getUiOptions.js';
 import isCustomWidget from '../isCustomWidget.js';
@@ -18,22 +19,26 @@ import isMultiSelect from './isMultiSelect.js';
 export default function getDisplayLabel(validator, schema, uiSchema = {}, rootSchema, globalOptions, experimental_customMergeAllOf) {
     const uiOptions = getUiOptions(uiSchema, globalOptions);
     const { label = true } = uiOptions;
-    let displayLabel = !!label;
-    const schemaType = getSchemaType(schema);
-    if (schemaType === 'array') {
-        displayLabel =
-            isMultiSelect(validator, schema, rootSchema, experimental_customMergeAllOf) ||
-                isFilesArray(validator, schema, uiSchema, rootSchema, experimental_customMergeAllOf) ||
-                isCustomWidget(uiSchema);
-    }
-    if (schemaType === 'object') {
-        displayLabel = false;
-    }
-    if (schemaType === 'boolean' && uiSchema && !uiSchema[UI_WIDGET_KEY]) {
-        displayLabel = false;
-    }
-    if (uiSchema && uiSchema[UI_FIELD_KEY]) {
-        displayLabel = false;
+    let displayLabel = Boolean(label);
+    if (displayLabel) {
+        const schemaType = getSchemaType(schema);
+        const addedByAdditionalProperty = get(schema, ADDITIONAL_PROPERTY_FLAG, false);
+        if (schemaType === 'array') {
+            displayLabel =
+                addedByAdditionalProperty ||
+                    isMultiSelect(validator, schema, rootSchema, experimental_customMergeAllOf) ||
+                    isFilesArray(validator, schema, uiSchema, rootSchema, experimental_customMergeAllOf) ||
+                    isCustomWidget(uiSchema);
+        }
+        if (schemaType === 'object') {
+            displayLabel = addedByAdditionalProperty;
+        }
+        if (schemaType === 'boolean' && uiSchema && !uiSchema[UI_WIDGET_KEY]) {
+            displayLabel = false;
+        }
+        if (uiSchema && uiSchema[UI_FIELD_KEY]) {
+            displayLabel = false;
+        }
     }
     return displayLabel;
 }

package/lib/schema/getDisplayLabel.js.map

@@ -1 +1 @@
-{"version":3,"file":"getDisplayLabel.js","sourceRoot":"","sources":["../../src/schema/getDisplayLabel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAU/C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C;;;;;;;;;;GAUG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CAKrC,SAAiC,EACjC,MAAS,EACT,WAA8B,EAAE,EAChC,UAAc,EACd,aAAqC,EACrC,6BAAgE;IAEhE,MAAM,SAAS,GAAG,YAAY,CAAU,QAAQ,EAAE,aAAa,CAAC,CAAC;IACjE,MAAM,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,SAAS,CAAC;IACnC,IAAI,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC;IAC3B,MAAM,UAAU,GAAG,aAAa,CAAI,MAAM,CAAC,CAAC;IAE5C,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;QAC3B,YAAY;YACV,aAAa,CAAU,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,6BAA6B,CAAC;gBACpF,YAAY,CAAU,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,6BAA6B,CAAC;gBAC7F,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAED,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC5B,YAAY,GAAG,KAAK,CAAC;IACvB,CAAC;IACD,IAAI,UAAU,KAAK,SAAS,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACrE,YAAY,GAAG,KAAK,CAAC;IACvB,CAAC;IACD,IAAI,QAAQ,IAAI,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QACvC,YAAY,GAAG,KAAK,CAAC;IACvB,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC"}
+{"version":3,"file":"getDisplayLabel.js","sourceRoot":"","sources":["../../src/schema/getDisplayLabel.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,OAAO,EAAE,wBAAwB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACrF,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAU/C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C;;;;;;;;;;GAUG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CAKrC,SAAiC,EACjC,MAAS,EACT,WAA8B,EAAE,EAChC,UAAc,EACd,aAAqC,EACrC,6BAAgE;IAEhE,MAAM,SAAS,GAAG,YAAY,CAAU,QAAQ,EAAE,aAAa,CAAC,CAAC;IACjE,MAAM,EAAE,KAAK,GAAG,IAAI,EAAE,GAAG,SAAS,CAAC;IACnC,IAAI,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAClC,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,UAAU,GAAG,aAAa,CAAI,MAAM,CAAC,CAAC;QAC5C,MAAM,yBAAyB,GAAG,GAAG,CAAC,MAAM,EAAE,wBAAwB,EAAE,KAAK,CAAC,CAAC;QAE/E,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;YAC3B,YAAY;gBACV,yBAAyB;oBACzB,aAAa,CAAU,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,6BAA6B,CAAC;oBACpF,YAAY,CAAU,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,6BAA6B,CAAC;oBAC7F,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC7B,CAAC;QAED,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;YAC5B,YAAY,GAAG,yBAAyB,CAAC;QAC3C,CAAC;QACD,IAAI,UAAU,KAAK,SAAS,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YACrE,YAAY,GAAG,KAAK,CAAC;QACvB,CAAC;QACD,IAAI,QAAQ,IAAI,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACvC,YAAY,GAAG,KAAK,CAAC;QACvB,CAAC;IACH,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC"}