Skip to content

Commit

Permalink
feat: sync changes from v2 to v2-develop
Browse files Browse the repository at this point in the history
  • Loading branch information
mguellsegarra authored and github-actions[bot] committed Dec 13, 2024
1 parent 0316ca6 commit 28a79f8
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 11 deletions.
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gisce/react-ooui",
"version": "2.47.0-rc.3",
"version": "2.50.0",
"engines": {
"node": "20.5.0"
},
Expand Down Expand Up @@ -35,7 +35,7 @@
"dependencies": {
"@ant-design/plots": "^1.0.9",
"@gisce/fiber-diagram": "2.1.1",
"@gisce/ooui": "2.25.0",
"@gisce/ooui": "2.26.0",
"@gisce/react-formiga-components": "1.8.0",
"@gisce/react-formiga-table": "1.9.0",
"@monaco-editor/react": "^4.4.5",
Expand Down
12 changes: 9 additions & 3 deletions src/widgets/containers/Group.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { Group as GroupOoui } from "@gisce/ooui";
import { Spinner } from "@/widgets/custom/Spinner";
import { FieldSet , useLocale } from "@gisce/react-formiga-components";
import { FieldSet, useLocale } from "@gisce/react-formiga-components";
import iconMapper from "@/helpers/iconMapper";

type Props = {
Expand All @@ -15,7 +15,13 @@ function Group(props: Props): React.ReactElement {
const icon: React.ElementType | undefined = iconMapper(ooui.icon || "");
const { t } = useLocale();
return (
<>
<div
style={{
height: ooui.height ? ooui.height + "px" : "100%",
overflowX: "hidden",
overflowY: "auto",
}}
>
{(ooui.label || icon) && showLabel ? (
<FieldSet label={ooui.label} icon={icon}>
<Spinner
Expand All @@ -31,7 +37,7 @@ function Group(props: Props): React.ReactElement {
responsiveBehaviour={responsiveBehaviour}
/>
)}
</>
</div>
);
}

Expand Down

0 comments on commit 28a79f8

Please sign in to comment.