@oliasoft-open-source/react-ui-library 4.20.5 → 4.20.7-beta-1

package/dist/index.d.ts

@@ -207,7 +207,7 @@ export declare interface IButtonProps {
     colored?: boolean | string;
     disabled?: boolean;
     ignoreDisabledContext?: boolean;
-    groupOrder?: string | null;
+    groupOrder?: TGroupOrder;
     icon?: ReactNode | string;
     label?: ReactNode | string | null;
     loading?: boolean;
@@ -511,7 +511,7 @@ declare interface IInputCell extends TCommonCell {
 
 export declare interface IInputGroupAddonProps {
     children: ReactNode;
-    groupOrder?: TGroupOrder | string | null;
+    groupOrder?: TGroupOrder;
     small?: boolean;
 }
 
@@ -539,7 +539,7 @@ export declare interface IInputProps {
     value?: TStringNumberNull;
     disabled?: boolean;
     right?: boolean;
-    groupOrder?: string;
+    groupOrder?: TGroupOrder;
     maxTooltipWidth?: TStringOrNumber;
     width?: TStringOrNumber;
     testId?: string;
@@ -744,6 +744,7 @@ export declare interface IMenuProps {
         testId?: string;
         fullHeightTrigger?: boolean;
     };
+    active?: boolean;
     contextMenu?: boolean;
     width?: TStringOrNumber;
     disabled?: boolean;
@@ -752,7 +753,7 @@ export declare interface IMenuProps {
     loading?: boolean;
     fullHeightTrigger?: boolean;
     closeOnOptionClick?: boolean;
-    groupOrder?: TGroupOrder | string;
+    groupOrder?: TGroupOrder;
     overflowContainer?: boolean;
     maxHeight?: TStringOrNumber;
     testId?: string;
@@ -867,7 +868,7 @@ export declare interface INativeSelectProps {
     tabIndex?: number;
     selectedOption?: ISelectSelectedOption;
     width?: TStringOrNumber | null;
-    groupOrder?: string | null;
+    groupOrder?: TGroupOrder;
     testId?: string | undefined;
     isInTable?: boolean;
     clearable?: boolean;
@@ -942,7 +943,7 @@ export declare interface INumberInputProps {
     }, error: string | null) => void;
     allowEmpty?: boolean;
     isInTable?: boolean;
-    groupOrder?: any;
+    groupOrder?: TGroupOrder;
     enableCosmeticRounding?: boolean;
     enableDisplayRounding?: boolean;
     roundDisplayValue?: (args: TStringOrNumber) => TStringOrNumber;
@@ -1614,6 +1615,7 @@ export declare interface IUnitInputProps {
     enableDisplayRounding?: boolean;
     roundDisplayValue?: (args: TStringOrNumber) => TStringOrNumber;
     selectOnFocus?: boolean;
+    groupOrder?: TGroupOrder;
 }
 
 declare interface IUnitTable extends Omit<ITableProps['table'], 'rows'> {
@@ -1913,7 +1915,7 @@ declare type TUnitTableCellShape = TCellShape | IUnitTableStaticCell | IUnitTabl
 
 declare type UnitContextType = any;
 
-export declare const UnitInput: ({ name, placeholder, disabled, disabledUnit, error, left, small, width, value, unitkey, initUnit, noConversion, onChange, onClick, onFocus, onSwitchUnit, unitTemplate, testId, warning, predefinedOptions, initialPredefinedOption, shouldLinkAutomaticly, selectedPredefinedOptionKey, validationCallback, disabledValidation, allowEmpty, convertBackToStorageUnit, enableCosmeticRounding, enableDisplayRounding, roundDisplayValue, selectOnFocus, }: IUnitInputProps) => JSX_2.Element;
+export declare const UnitInput: ({ name, placeholder, disabled, disabledUnit, error, left, small, width, value, unitkey, initUnit, noConversion, onChange, onClick, onFocus, onSwitchUnit, unitTemplate, testId, warning, predefinedOptions, initialPredefinedOption, shouldLinkAutomaticly, selectedPredefinedOptionKey, validationCallback, disabledValidation, allowEmpty, convertBackToStorageUnit, enableCosmeticRounding, enableDisplayRounding, roundDisplayValue, selectOnFocus, groupOrder, }: IUnitInputProps) => JSX_2.Element;
 
 export declare const UnitTable: ({ table, unitConfig, convertBackToStorageUnit, enableCosmeticRounding, enableDisplayRounding, }: IUnitTableProps) => JSX_2.Element;
 

package/dist/index.js

@@ -4079,7 +4079,7 @@ const Button$1 = ({
   colored: colored2 = false,
   disabled: disabled2 = false,
   ignoreDisabledContext = false,
-  groupOrder = null,
+  groupOrder,
   icon: icon2 = null,
   label: label2 = "",
   loading = false,
@@ -4674,6 +4674,7 @@ const TriggerTooltip = ({
 };
 const Trigger$1 = React__default.forwardRef(
   ({
+    active: active2,
     isDisabled,
     badgeTitle,
     badgeDot,
@@ -4712,7 +4713,7 @@ const Trigger$1 = React__default.forwardRef(
         loading,
         error: error2,
         warning: warning2,
-        active: isOpen2,
+        active: isOpen2 || active2,
         tabIndex
       }
     ) : trigger2 === TriggerType.TEXT ? /* @__PURE__ */ jsx(
@@ -4880,7 +4881,8 @@ const DropDownMenu = ({
   error: error2,
   warning: warning2,
   selected: selected2,
-  tabIndex
+  tabIndex,
+  active: active2
 }) => {
   const disabledContext = useContext(DisabledContext);
   const {
@@ -4946,6 +4948,7 @@ const DropDownMenu = ({
         component: component2,
         groupOrder,
         isOpen: isOpen2,
+        active: active2,
         tooltip: tooltip2,
         error: error2,
         warning: warning2,
@@ -9110,9 +9113,9 @@ const Input$1 = forwardRef(
     const order2 = (() => {
       if (groupOrder) {
         switch (groupOrder) {
-          case "first":
+          case GroupOrder.FIRST:
             return styles$A.groupOrderFirst;
-          case "last":
+          case GroupOrder.LAST:
             return styles$A.groupOrderLast;
           default:
             return styles$A.groupOrderMiddle;
@@ -9489,7 +9492,7 @@ const styles$v = {
 };
 const InputGroupAddon = ({
   children,
-  groupOrder = null,
+  groupOrder,
   small: small2 = false
 }) => {
   const order2 = (() => {
@@ -15384,7 +15387,7 @@ const NativeSelect = ({
   tabIndex = 0,
   selectedOption,
   width: width2 = null,
-  groupOrder = null,
+  groupOrder,
   testId,
   isInTable: isInTable2 = false,
   clearable,
@@ -66461,7 +66464,8 @@ const UnitInput = ({
   enableCosmeticRounding = true,
   enableDisplayRounding = false,
   roundDisplayValue,
-  selectOnFocus
+  selectOnFocus,
+  groupOrder
 }) => {
   const context2 = useUnitContext();
   const runAfterUpdate = useRunAfterUpdate();
@@ -66675,6 +66679,8 @@ const UnitInput = ({
     }
     return placeholder22;
   };
+  const inputGroupOrder = !predefinedOptions && (!groupOrder || groupOrder === GroupOrder.FIRST) ? GroupOrder.FIRST : GroupOrder.MIDDLE;
+  const unitGroupOrder = !groupOrder || groupOrder === GroupOrder.LAST ? GroupOrder.LAST : GroupOrder.MIDDLE;
   return /* @__PURE__ */ jsx(
     "div",
     {
@@ -66722,18 +66728,18 @@ const UnitInput = ({
             enableCosmeticRounding,
             enableDisplayRounding,
             roundDisplayValue,
-            groupOrder: predefinedOptions ? "middle" : "first",
+            groupOrder: inputGroupOrder,
             disableInternalErrorValidationMessages,
             small: small2,
             selectOnFocus
           },
           stringName
         ) }),
-        displayUnitLabel && (noConvert || !knownUnit ? /* @__PURE__ */ jsx(InputGroupAddon, { groupOrder: "last", children: displayUnitLabel }) : /* @__PURE__ */ jsx(
+        displayUnitLabel && (noConvert || !knownUnit ? /* @__PURE__ */ jsx(InputGroupAddon, { groupOrder: unitGroupOrder, children: displayUnitLabel }) : /* @__PURE__ */ jsx(
           Menu,
           {
+            groupOrder: unitGroupOrder,
             maxHeight: 380,
-            groupOrder: "last",
             disabled: disabledUnit,
             testId: testId && `${testId}-menu`,
             tabIndex: -1,