Commit1a3883c

committed

Modal: fix external styling classes on modal/drawer not working

1 parent2f871a5 commit1a3883cCopy full SHA for 1a3883c

File tree

+19

-3

lines changed

+19

-3

lines changed

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,6 @@ function UIView(props: {`
`219`	`219`	`viewFn:any;`
`220`	`220`	`}){`
`221`	`221`	`constcomp=props.comp;`
`222`		`-`
`223`	`222`	`constchildrenProps=childrenToProps(comp.children);`
`224`	`223`	`constparentDisabled=useContext(DisabledContext);`
`225`	`224`	`constdisabled=childrenProps["disabled"];`
`@@ -236,6 +235,17 @@ function UIView(props: {`
`236`	`235`	`}`
`237`	`236`	`//END ADD BY FRED`
`238`	`237`
	`238`	`+if(comp.children.hasOwnProperty('showMask')&&comp.children.hasOwnProperty('maskClosable')){`
	`239`	`+return(`
	`240`	`+<HidableViewhidden={childrenProps.hiddenasboolean}>`
	`241`	`+{props.viewFn(`
	`242`	`+childrenProps,`
	`243`	`+comp.dispatch`
	`244`	`+)}`
	`245`	`+</HidableView>`
	`246`	`+);`
	`247`	`+}`
	`248`	`+`
`239`	`249`	`return(`
`240`	`250`	`<div`
`241`	`251`	`ref={props.innerRef}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,8 @@ let TmpDrawerComp = (function () {`
`167`	`167`	`zIndex={Layers.drawer}`
`168`	`168`	`maskClosable={props.maskClosable}`
`169`	`169`	`mask={props.showMask}`
	`170`	`+className={props.classNameasstring}`
	`171`	`+data-testid={props.dataTestIdasstring}`
`170`	`172`	`>`
`171`	`173`	`<ButtonStyle`
`172`	`174`	`$closePosition={props.closePosition}`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import { trans } from "i18n";`
`26`	`26`	`import_from"lodash";`
`27`	`27`	`importdayjsfrom"dayjs";`
`28`	`28`	`import{ConstructorToComp}from"lowcoder-core";`
`29`		`-import{Section,sectionNames}from"lowcoder-design";`
	`29`	`+import{ScrollBar,Section,sectionNames}from"lowcoder-design";`
`30`	`30`	`importReact,{useContext,useEffect,useMemo}from"react";`
`31`	`31`	`import{useInterval,useTitle,useWindowSize}from"react-use";`
`32`	`32`	`import{useCurrentUser}from"util/currentUser";`
`@@ -204,7 +204,9 @@ export class HookComp extends HookTmpComp {`
`204`	`204`	`return(`
`205`	`205`	`<>`
`206`	`206`	`<CompNamename={this.children.name.getView()}/>`
`207`		`-{this.children.comp.getPropertyView()}`
	`207`	`+<ScrollBar>`
	`208`	`+{this.children.comp.getPropertyView()}`
	`209`	`+</ScrollBar>`
`208`	`210`	`</>`
`209`	`211`	`);`
`210`	`212`	`}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,8 @@ let TmpModalComp = (function () {`
`155`	`155`	`zIndex={Layers.modal}`
`156`	`156`	`modalRender={(node)=><ModalStyled$style={props.style}>{node}</ModalStyled>}`
`157`	`157`	`mask={props.showMask}`
	`158`	`+className={props.classNameasstring}`
	`159`	`+data-testid={props.dataTestIdasstring}`
`158`	`160`	`>`
`159`	`161`	`<InnerGrid`
`160`	`162`	`{...otherContainerProps}`

Comments

(0)