Merge pull request #654 from illacloud/develop

Develop
illacloud · Jan 12, 2023 · 89dfbcd · 89dfbcd
2 parents 515a857 + 4dd5695
commit 89dfbcd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/packages/input-tag/src/input-tag.tsx b/packages/input-tag/src/input-tag.tsx
@@ -154,8 +154,8 @@ export const InputTag = forwardRef<HTMLDivElement, InputTagProps>(
               await tryAddInputValueToTag()
             }}
           />
-          {suffix ? <span css={applySuffixCls(size)}>{suffix}</span> : null}
         </span>
+        {suffix ? <span css={applySuffixCls(size)}>{suffix}</span> : null}
         {allowClear && !disabled && currentValue?.length ? (
           <span
             css={pointerStyle}

diff --git a/packages/modal/src/interface.tsx b/packages/modal/src/interface.tsx
@@ -1,6 +1,7 @@
 import { HTMLAttributes, MouseEvent, ReactNode } from "react"
 import { ButtonProps } from "@illa-design/button"
 import { BoxProps } from "@illa-design/theme"
+import { SerializedStyles } from "@emotion/react"
 
 export type ModalAlignType = "left" | "center" | "right" | ""
 export type ModalType = "info" | "error" | "success" | "warning"
@@ -16,6 +17,7 @@ export interface ModalProps
   mask?: boolean
   okLoading?: boolean
   title?: ReactNode | string
+  maskStyle?: SerializedStyles
   maskClosable?: boolean
   hideCancel?: boolean
   closable?: boolean

diff --git a/packages/modal/src/modal.tsx b/packages/modal/src/modal.tsx
@@ -43,6 +43,7 @@ export const Modal = forwardRef<HTMLDivElement, ModalProps>((props, ref) => {
     withoutLine = true,
     okLoading,
     maskClosable = true,
+    maskStyle,
     hideCancel,
     closable,
     closeElement,
@@ -121,7 +122,7 @@ export const Modal = forwardRef<HTMLDivElement, ModalProps>((props, ref) => {
           <>
             {mask ? (
               <motion.div
-                css={applyModalMask}
+                css={[applyModalMask, maskStyle]}
                 variants={maskAnimation}
                 animate="animate"
                 exit="exit"