Commit a7e34c9

committed

[FIX] GlobalCSS styling for Modals/Drawers

1 parent c8d069f commit a7e34c9Copy full SHA for a7e34c9

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ function styleNamespace(id: string) {`
`6`	`6`
`7`	`7`	`export function evalStyle(id: string, css: string[], globalStyle?: boolean) {`
`8`	`8`	`const styleId = styleNamespace(id);`
`9`		- const prefixId = globalStyle ? id : `#${id}`
	`9`	+ const prefixId = globalStyle ? id : `.${id}`;
`10`	`10`	`let compiledCSS = "";`
`11`	`11`	`css.forEach((i) => {`
`12`	`12`	`if (!i.trim()) {`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ import { isNumeric } from "util/stringUtils";`
`26`	`26`	`import { NameConfig, withExposingConfigs } from "../generators/withExposing";`
`27`	`27`	`import { title } from "process";`
`28`	`28`	`import { SliderControl } from "../controls/sliderControl";`
	`29`	`+import clsx from "clsx";`
	`30`	`+import { useApplicationId } from "util/hooks";`
`29`	`31`
`30`	`32`	`const EventOptions = [closeEvent] as const;`
`31`	`33`
`@@ -119,6 +121,7 @@ let TmpDrawerComp = (function () {`
`119`	`121`	`const isTopBom = ["top", "bottom"].includes(props.placement);`
`120`	`122`	`const { items, ...otherContainerProps } = props.container;`
`121`	`123`	`const userViewMode = useUserViewMode();`
	`124`	`+ const appID = useApplicationId();`
`122`	`125`	`const resizable = !userViewMode && (!isTopBom \|\| !props.autoHeight);`
`123`	`126`	`const onResizeStop = useCallback(`
`124`	`127`	`(`
`@@ -172,7 +175,7 @@ let TmpDrawerComp = (function () {`
`172`	`175`	`zIndex={Layers.drawer}`
`173`	`176`	`maskClosable={props.maskClosable}`
`174`	`177`	`mask={props.showMask}`
`175`		`- className={props.classNameasstring}`
	`178`	+ className={clsx(`app-${appID}`,props.className)}
`176`	`179`	`data-testid={props.dataTestId as string}`
`177`	`180`	`>`
`178`	`181`	`{props.toggleClose && (`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ import { BoolControl } from "comps/controls/boolControl";`
`24`	`24`	`import { withDefault } from "comps/generators";`
`25`	`25`	`import { SliderControl } from "../controls/sliderControl";`
`26`	`26`	`import { getBackgroundStyle } from "@lowcoder-ee/util/styleUtils";`
	`27`	`+import clsx from "clsx";`
	`28`	`+import { useApplicationId } from "util/hooks";`
`27`	`29`
`28`	`30`	`const EventOptions = [`
`29`	`31`	`{ label: trans("modalComp.open"), value: "open", description: trans("modalComp.openDesc") },`
`@@ -113,6 +115,7 @@ let TmpModalComp = (function () {`
`113`	`115`	`},`
`114`	`116`	`(props, dispatch) => {`
`115`	`117`	`const userViewMode = useUserViewMode();`
	`118`	`+ const appID = useApplicationId();`
`116`	`119`	`const bodyStyle: CSSProperties = { padding: 0 };`
`117`	`120`	`const width = transToPxSize(props.width \|\| DEFAULT_WIDTH);`
`118`	`121`	`let height = undefined;`
`@@ -177,7 +180,7 @@ let TmpModalComp = (function () {`
`177`	`180`	`zIndex={Layers.modal}`
`178`	`181`	`modalRender={(node) => <ModalStyled $style={props.style} $modalScrollbar={props.modalScrollbar}>{node}</ModalStyled>}`
`179`	`182`	`mask={props.showMask}`
`180`		`- className={props.classNameasstring}`
	`183`	+ className={clsx(`app-${appID}`,props.className)}
`181`	`184`	`data-testid={props.dataTestId as string}`
`182`	`185`	`>`
`183`	`186`	`<InnerGrid`

Comments

(0)