@gisce/react-ooui 1.2.0-rc.83 → 1.2.0-rc.85

package/dist/widgets/custom/ButtonGroup.d.ts

@@ -3,6 +3,6 @@ import { ButtonGroup as ButtonGroupOoui } from "@gisce/ooui";
 declare type ButtonGroupProps = {
     ooui: ButtonGroupOoui;
 };
-export declare const ButtonGroup: (props: ButtonGroupProps) => React.JSX.Element;
+export declare const ButtonGroup: (props: ButtonGroupProps) => React.JSX.Element | null | undefined;
 export {};
 //# sourceMappingURL=ButtonGroup.d.ts.map

package/dist/widgets/custom/ButtonGroup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ButtonGroup.d.ts","sourceRoot":"","sources":["ButtonGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+B,MAAM,OAAO,CAAC;AAIpD,OAAO,EACL,WAAW,IAAI,eAAe,EAG/B,MAAM,aAAa,CAAC;AAQrB,aAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AAMF,eAAO,MAAM,WAAW,UAAW,gBAAgB,sBAoElD,CAAC"}
+{"version":3,"file":"ButtonGroup.d.ts","sourceRoot":"","sources":["ButtonGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA+B,MAAM,OAAO,CAAC;AAKpD,OAAO,EACL,WAAW,IAAI,eAAe,EAG/B,MAAM,aAAa,CAAC;AAQrB,aAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AAQF,eAAO,MAAM,WAAW,UAAW,gBAAgB,yCA2ElD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.2.0-rc.83",
+  "version": "1.2.0-rc.85",
   "files": [
     "dist",
     "src",
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
-    "@gisce/ooui": "^0.19.5-rc.1",
+    "@gisce/ooui": "^0.19.6",
     "@gisce/react-formiga-components": "^1.0.9-rc.21",
     "@gisce/react-formiga-table": "^0.5.0",
     "@monaco-editor/react": "^4.4.5",

package/src/actionbar/SearchBar.tsx

@@ -13,9 +13,8 @@ function SearchBar(props: Props) {
   const { onSearch, disabled = false, searchText } = props;
   const { t } = useContext(LocaleContext) as LocaleContextType;
   const [form] = Form.useForm();
-  const [mustShowClearSuffix, setMustShowClearSuffix] = useState<boolean>(
-    false
-  );
+  const [mustShowClearSuffix, setMustShowClearSuffix] =
+    useState<boolean>(false);
 
   function handleSubmit(values: any) {
     onSearch(values.search);
@@ -42,6 +41,7 @@ function SearchBar(props: Props) {
               onChange={(e) => {
                 setMustShowClearSuffix(e.target.value.length > 0);
               }}
+              style={{ borderTopRightRadius: 0, borderBottomRightRadius: 0 }}
               suffix={
                 (mustShowClearSuffix ||
                   (searchText && searchText.length > 0)) && (
@@ -57,7 +57,11 @@ function SearchBar(props: Props) {
           </Form.Item>
         </Col>
         <Col>
-          <Button htmlType="submit" disabled={disabled}>
+          <Button
+            htmlType="submit"
+            disabled={disabled}
+            style={{ borderTopLeftRadius: 0, borderBottomLeftRadius: 0 }}
+          >
             {t("search")}
           </Button>
         </Col>

package/src/widgets/base/many2one/Many2one.tsx

@@ -257,7 +257,7 @@ export const Many2oneInput: React.FC<Many2oneInputProps> = (
           }
         />
       </Col>
-      <Col flex="32px">
+      <Col flex="32px" style={{ paddingRight: 0 }}>
         <Button
           icon={<FolderOpenOutlined />}
           disabled={id === undefined || text === "" || inputText === undefined}
@@ -268,7 +268,7 @@ export const Many2oneInput: React.FC<Many2oneInputProps> = (
           tabIndex={-1}
         />
       </Col>
-      <Col flex="32px">
+      <Col flex="32px" style={{ paddingLeft: 0 }}>
         <Button
           icon={searching ? <LoadingOutlined /> : <SearchOutlined />}
           disabled={readOnly || searching}

package/src/widgets/custom/ButtonGroup.tsx

@@ -2,6 +2,7 @@ import React, { useContext, useState } from "react";
 import Field from "@/common/Field";
 import { DownOutlined } from "@ant-design/icons";
 import { Dropdown, Menu } from "antd";
+import { Button } from "@/widgets/base/Button";
 import {
   ButtonGroup as ButtonGroupOoui,
   Button as ButtonOoui,
@@ -20,6 +21,8 @@ type ButtonGroupProps = {
 
 type ItemsProps = {
   ooui: ButtonOoui[];
+  executeButtonAction: any,
+  lang: string
 };
 
 export const ButtonGroup = (props: ButtonGroupProps) => {
@@ -73,27 +76,37 @@ export const ButtonGroup = (props: ButtonGroupProps) => {
 
     onClick_confirm();
   }
-
-  return (
-    <Field ooui={new FieldOoui({ ...{ ooui } })}>
-      <Dropdown.Button
-        disabled={!activated || readOnly}
-        onClick={onClick}
-        icon={<DownOutlined />}
-        type={primary ? "primary" : undefined}
-        //danger={danger ? true : undefined} This works but typescript
-        // doesn't accept
-        overlay={Items({ooui: secondaryButtons})}
-      >
-        {getButtonIcon()}
-        {caption}
-      </Dropdown.Button>
-    </Field>
-  );
+  if (ooui.buttons.length === 0) {
+    return null;
+  } else if (ooui.buttons.length > 1) {
+    return (
+      <Field ooui={new FieldOoui({ ...{ ooui } })}>
+        <Dropdown.Button
+          disabled={!activated || readOnly}
+          onClick={onClick}
+          icon={<DownOutlined />}
+          type={primary ? "primary" : undefined}
+          //danger={danger ? true : undefined} This works but typescript
+          // doesn't accept
+          overlay={<Items ooui={secondaryButtons} executeButtonAction={executeButtonAction} lang={lang} /> }
+        >
+          {getButtonIcon()}
+          {caption}
+        </Dropdown.Button>
+      </Field>
+    );
+  }  else if (defaultButton) {
+    return (
+      <Button ooui={defaultButton} />
+    )
+  }
 };
 
 const Items = (props: ItemsProps) => {
-  const { ooui } = props;
+  const { ooui, executeButtonAction, lang } = props;
+  if (!ooui) {
+    return null;
+  }
   const items = ooui.map((button) => {
     const {
       id,
@@ -106,10 +119,7 @@ const Items = (props: ItemsProps) => {
       readOnly,
       danger,
     } = button;
-    const formContext = useContext(FormContext) as FormContextType;
-    const { executeButtonAction } = formContext || {};
     const [isRunning, setIsRunning] = useState<boolean>(false);
-    const { lang } = useContext(LocaleContext) as LocaleContextType;
 
     async function onClick_confirm() {
       setIsRunning(true);