@headless-adminapp/fluent 1.1.0 → 1.1.2

package/App/AppUI.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppUI = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
+const react_components_1 = require("@fluentui/react-components");
 const hooks_1 = require("@headless-adminapp/app/hooks");
 const react_1 = require("react");
 const AppHeaderContianer_1 = require("./AppHeaderContianer");
@@ -18,7 +19,12 @@ const AppUI = ({ children }) => {
             flexDirection: 'column',
             position: 'fixed',
             inset: 0,
-        }, children: [(0, jsx_runtime_1.jsx)(AppHeaderContianer_1.AppHeaderContainer, { onNavToggle: () => setIsNavOpen(!isNavOpen) }), (0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', flex: 1, overflow: 'hidden' }, children: [(0, jsx_runtime_1.jsx)(Navigation_1.NavigationContainer, { open: isNavOpen, type: navType, onOpenChange: (open) => setIsNavOpen(open) }), (0, jsx_runtime_1.jsx)("div", { style: {
+        }, children: [(0, jsx_runtime_1.jsx)(AppHeaderContianer_1.AppHeaderContainer, { onNavToggle: () => setIsNavOpen(!isNavOpen) }), (0, jsx_runtime_1.jsxs)("div", { style: {
+                    display: 'flex',
+                    flex: 1,
+                    overflow: 'hidden',
+                    background: react_components_1.tokens.colorNeutralBackground1,
+                }, children: [(0, jsx_runtime_1.jsx)(Navigation_1.NavigationContainer, { open: isNavOpen, type: navType, onOpenChange: (open) => setIsNavOpen(open) }), (0, jsx_runtime_1.jsx)("div", { style: {
                             display: 'flex',
                             flexDirection: 'column',
                             flex: 1,

package/DataForm/SectionControl.d.ts

@@ -2,6 +2,7 @@ import { PropsWithChildren } from 'react';
 interface SectionControlWrapperProps {
     label: string;
     labelPosition?: 'top' | 'left';
+    labelHidden?: boolean;
     required?: boolean;
     isError?: boolean;
     errorMessage?: string;

package/DataForm/SectionControl.js

@@ -4,5 +4,5 @@ exports.SectionControlWrapper = SectionControlWrapper;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_components_1 = require("@fluentui/react-components");
 function SectionControlWrapper(props) {
-    return ((0, jsx_runtime_1.jsx)(react_components_1.Field, { label: props.label, orientation: props.labelPosition === 'top' ? 'vertical' : 'horizontal', required: props.required, validationState: props.isError ? 'error' : undefined, validationMessage: props.errorMessage, validationMessageIcon: null, children: props.children }));
+    return ((0, jsx_runtime_1.jsx)(react_components_1.Field, { label: props.labelHidden ? undefined : props.label, orientation: props.labelPosition === 'top' ? 'vertical' : 'horizontal', required: props.labelHidden ? undefined : props.required, validationState: props.isError ? 'error' : undefined, validationMessage: props.errorMessage, validationMessageIcon: null, children: props.children }));
 }

package/PageEntityForm/SectionContainer.js

@@ -84,7 +84,8 @@ function SectionContainer({ section }) {
                                     attribute.localizedLabels?.[language] ??
                                     control.label ??
                                     attribute.label;
-                                return ((0, jsx_runtime_1.jsx)(SectionControl_1.SectionControlWrapper, { label: label, labelPosition: isMobile ? 'top' : section.labelPosition, required: required, isError: isError, errorMessage: errorMessage, children: (0, jsx_runtime_1.jsx)(Control, { attribute: attribute, name: control.attributeName, value: field.value, onChange: (value) => {
+                                const labelHidden = control.labelHidden;
+                                return ((0, jsx_runtime_1.jsx)(SectionControl_1.SectionControlWrapper, { label: label, labelHidden: labelHidden, labelPosition: isMobile ? 'top' : section.labelPosition, required: required, isError: isError, errorMessage: errorMessage, children: (0, jsx_runtime_1.jsx)(Control, { attribute: attribute, name: control.attributeName, value: field.value, onChange: (value) => {
                                             const previousValue = field.value;
                                             field.onChange(value);
                                             eventManager.emit(constants_1.EVENT_KEY_ON_FIELD_CHANGE, control.attributeName, value, previousValue);

package/form/controls/AttachmentControl.d.ts

@@ -6,7 +6,7 @@ interface UseAttachmentSelectorOptions {
     fileService: IFileService | null;
     fileServiceContext?: Record<string, unknown>;
     location: AttachmentAttribute['location'];
-    onChange?: (fileObject: FileObject) => void;
+    onChange?: (fileObject: FileObject) => void | Promise<void>;
 }
 export declare function useAttachmentSelector({ fileService, fileServiceContext, location, onChange, }: UseAttachmentSelectorOptions): {
     isProcessing: boolean;

package/form/controls/AttachmentControl.js

@@ -26,8 +26,8 @@ function useAttachmentSelector({ fileService, fileServiceContext, location, onCh
                 return (0, utils_1.urlToFileObject)(url);
             }
         },
-        onSuccess: (fileObject) => {
-            onChange?.(fileObject);
+        onSuccess: async (fileObject) => {
+            await onChange?.(fileObject);
         },
         onError: (error) => {
             console.error(error);

package/form/controls/DurationControl.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DurationControl = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_components_1 = require("@fluentui/react-components");
+const utils_1 = require("@headless-adminapp/app/utils");
 const react_1 = require("react");
 const useStyles = (0, react_components_1.makeStyles)({
     listbox: {
@@ -105,7 +106,7 @@ const DurationControl = ({ value, onChange, id, name, onBlur, onFocus, placehold
     const [filterEnabled, setFilterEnabled] = (0, react_1.useState)(false);
     const styles = useStyles();
     (0, react_1.useEffect)(() => {
-        setSearchText(getDisplayValue(value));
+        setSearchText((0, utils_1.formatDuration)(value));
     }, [value]);
     const filteredItems = (0, react_1.useMemo)(() => {
         if (!filterEnabled) {
@@ -124,7 +125,7 @@ const DurationControl = ({ value, onChange, id, name, onBlur, onFocus, placehold
                 if (newValue !== null) {
                     onChange?.(newValue);
                 }
-                setSearchText(getDisplayValue(newValue));
+                setSearchText((0, utils_1.formatDuration)(newValue));
                 setFilterEnabled(false);
                 onBlur?.();
             }, onFocus: onFocus, id: id, autoFocus: autoFocus, onChange: (e) => {
@@ -141,40 +142,6 @@ const DurationControl = ({ value, onChange, id, name, onBlur, onFocus, placehold
             }, children: filteredItems.map((item) => ((0, jsx_runtime_1.jsx)(react_components_1.Option, { value: item.value, children: item.text }, item.value))) }) }));
 };
 exports.DurationControl = DurationControl;
-function getDisplayValue(value) {
-    if (!value) {
-        return '';
-    }
-    // No decimal, if value is decimal, round to nearest whole number
-    // 1 - 1 minute
-    // 2-59 minutes -> 2-59 minutes
-    // 90 minutes -> 1.5 hours
-    // more than a day -> 1 day, 1.5 days, 2 days, etc.
-    // check if value has decimal
-    if (value % 1 !== 0) {
-        // round to nearest whole number
-        value = Math.round(value);
-    }
-    if (!value) {
-        return '';
-    }
-    if (value === 1) {
-        return '1 minute';
-    }
-    if (value < 60) {
-        return `${value} minutes`;
-    }
-    if (value === 60) {
-        return '1 hour';
-    }
-    if (value < 1440) {
-        return `${Number((value / 60).toFixed(2))} hours`;
-    }
-    if (value === 1440) {
-        return '1 day';
-    }
-    return `${Number((value / 1440).toFixed(2))} days`;
-}
 function resolveValue(value) {
     if (!value) {
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-adminapp/fluent",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -50,5 +50,5 @@
     "uuid": "11.0.3",
     "yup": "^1.4.0"
   },
-  "gitHead": "a244ac890d3abda779c8f41c3cd51031381c062c"
+  "gitHead": "8d492b1b7266fbb8bba1124a8dc51311f54f8fcb"
 }