@rjsf/fluentui-rc 6.0.2 → 6.1.0

package/lib/WrapIfAdditionalTemplate/WrapIfAdditionalTemplate.js

@@ -6,23 +6,40 @@ const useStyles = makeStyles({
     input: {
         width: '100%',
     },
+    grow: {
+        flexGrow: 1,
+    },
+    halfWidth: {
+        width: '46%',
+    },
+    alignEnd: {
+        alignSelf: 'flex-end',
+        justifyContent: 'flex-end',
+    },
+    alignCenter: {
+        alignSelf: 'center',
+        marginTop: '-14px',
+        justifyContent: 'flex-end',
+    },
     label: {
         marginBottom: '4px',
     },
 });
+const containerTypes = ['object', 'array'];
 /** The `WrapIfAdditional` component is used by the `FieldTemplate` to rename, or remove properties that are
  * part of an `additionalProperties` part of a schema.
  *
  * @param props - The `WrapIfAdditionalProps` for this component
  */
 export default function WrapIfAdditionalTemplate(props) {
-    const { children, classNames, style, disabled, id, label, onRemoveProperty, onKeyRenameBlur, readonly, required, schema, uiSchema, registry, } = props;
+    const { children, classNames, style, disabled, id, label, displayLabel, onRemoveProperty, onKeyRenameBlur, rawDescription, readonly, required, schema, uiSchema, registry, } = props;
     const { templates, translateString } = registry;
     const classes = useStyles();
     // Button templates are not overridden in the uiSchema
     const { RemoveButton } = templates.ButtonTemplates;
     const keyLabel = translateString(TranslatableString.KeyLabel, [label]);
     const additional = ADDITIONAL_PROPERTY_FLAG in schema;
+    const hasDescription = !!rawDescription;
     const btnStyle = {
         flex: 1,
         paddingLeft: 6,
@@ -30,10 +47,13 @@ export default function WrapIfAdditionalTemplate(props) {
         fontWeight: 'bold',
     };
     if (!additional) {
-        return (_jsx("div", { className: classNames, style: style, children: children }));
+        const { type } = schema;
+        // Flex grow only non container classes
+        const className = containerTypes.includes(type) ? classNames : `${classes.grow} ${classNames}`;
+        return (_jsx("div", { className: className, style: style, children: children }));
     }
-    return (_jsxs(Flex, { gap: 'gap.medium', vAlign: 'center', className: classNames, style: style, children: [_jsx("div", { children: _jsx(Field, { label: keyLabel, required: required, children: _jsx(Input, { required: required, defaultValue: label, disabled: disabled || readonly, id: `${id}-key`, name: `${id}-key`, onBlur: !readonly ? onKeyRenameBlur : undefined, type: 'text', input: {
+    return (_jsxs(Flex, { gap: 'gap.medium', vAlign: 'start', className: classNames, style: style, children: [_jsx("div", { className: classes.halfWidth, children: _jsx(Field, { label: displayLabel ? keyLabel : undefined, required: required, children: _jsx(Input, { required: required, defaultValue: label, disabled: disabled || readonly, id: `${id}-key`, name: `${id}-key`, onBlur: !readonly ? onKeyRenameBlur : undefined, type: 'text', input: {
                             className: classes.input,
-                        } }) }) }), _jsx("div", { children: children }), _jsx("div", { children: _jsx(RemoveButton, { id: buttonId(id, 'remove'), iconType: 'default', className: 'rjsf-object-property-remove', style: btnStyle, disabled: disabled || readonly, onClick: onRemoveProperty, uiSchema: uiSchema, registry: registry }) })] }, `${id}-key`));
+                        } }) }) }), _jsx("div", { className: classes.halfWidth, children: children }), _jsx("div", { className: hasDescription ? classes.alignCenter : classes.alignEnd, children: _jsx(RemoveButton, { id: buttonId(id, 'remove'), iconType: 'default', className: 'rjsf-object-property-remove', style: btnStyle, disabled: disabled || readonly, onClick: onRemoveProperty, uiSchema: uiSchema, registry: registry }) })] }, `${id}-key`));
 }
 //# sourceMappingURL=WrapIfAdditionalTemplate.js.map

package/lib/WrapIfAdditionalTemplate/WrapIfAdditionalTemplate.js.map

@@ -1 +1 @@
-{"version":3,"file":"WrapIfAdditionalTemplate.js","sourceRoot":"","sources":["../../src/WrapIfAdditionalTemplate/WrapIfAdditionalTemplate.tsx"],"names":[],"mappings":";AACA,OAAO,EACL,wBAAwB,EACxB,QAAQ,EAIR,kBAAkB,GAEnB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AAEvD,MAAM,SAAS,GAAG,UAAU,CAAC;IAC3B,KAAK,EAAE;QACL,KAAK,EAAE,MAAM;KACd;IACD,KAAK,EAAE;QACL,YAAY,EAAE,KAAK;KACpB;CACF,CAAC,CAAC;AAEH;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAI9C,KAA6C;IAC7C,MAAM,EACJ,QAAQ,EACR,UAAU,EACV,KAAK,EACL,QAAQ,EACR,EAAE,EACF,KAAK,EACL,gBAAgB,EAChB,eAAe,EACf,QAAQ,EACR,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,QAAQ,GACT,GAAG,KAAK,CAAC;IACV,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,QAAQ,CAAC;IAChD,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC;IAC5B,sDAAsD;IACtD,MAAM,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC,eAAe,CAAC;IACnD,MAAM,QAAQ,GAAG,eAAe,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACvE,MAAM,UAAU,GAAG,wBAAwB,IAAI,MAAM,CAAC;IACtD,MAAM,QAAQ,GAAkB;QAC9B,IAAI,EAAE,CAAC;QACP,WAAW,EAAE,CAAC;QACd,YAAY,EAAE,CAAC;QACf,UAAU,EAAE,MAAM;KACnB,CAAC;IAEF,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,CACL,cAAK,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,YACrC,QAAQ,GACL,CACP,CAAC;IACJ,CAAC;IAED,OAAO,CACL,MAAC,IAAI,IAAC,GAAG,EAAC,YAAY,EAAC,MAAM,EAAC,QAAQ,EAAmB,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,aAC1F,wBACE,KAAC,KAAK,IAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,YACxC,KAAC,KAAK,IACJ,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,KAAK,EACnB,QAAQ,EAAE,QAAQ,IAAI,QAAQ,EAC9B,EAAE,EAAE,GAAG,EAAE,MAAM,EACf,IAAI,EAAE,GAAG,EAAE,MAAM,EACjB,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,EAC/C,IAAI,EAAC,MAAM,EACX,KAAK,EAAE;4BACL,SAAS,EAAE,OAAO,CAAC,KAAK;yBACzB,GACD,GACI,GACJ,EACN,wBAAM,QAAQ,GAAO,EACrB,wBACE,KAAC,YAAY,IACX,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,EAC1B,QAAQ,EAAC,SAAS,EAClB,SAAS,EAAC,6BAA6B,EACvC,KAAK,EAAE,QAAQ,EACf,QAAQ,EAAE,QAAQ,IAAI,QAAQ,EAC9B,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,GAClB,GACE,KA7BoC,GAAG,EAAE,MAAM,CA8BhD,CACR,CAAC;AACJ,CAAC"}
+{"version":3,"file":"WrapIfAdditionalTemplate.js","sourceRoot":"","sources":["../../src/WrapIfAdditionalTemplate/WrapIfAdditionalTemplate.tsx"],"names":[],"mappings":"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"}