mui-material.version=5.15.19

mui-icons-material.version=5.15.19 mui-base.version=5.0.0-beta.47
karakum-team · Jun 2, 2024 · ffe9fed · ffe9fed
1 parent 94a6fb0
commit ffe9fed
Show file tree

Hide file tree

Showing 12 changed files with 138 additions and 180 deletions.
diff --git a/buildSrc/src/main/kotlin/karakum/mui/KotlinType.kt b/buildSrc/src/main/kotlin/karakum/mui/KotlinType.kt
@@ -169,6 +169,7 @@ private val STANDARD_TYPE_MAP = mapOf(
     "React.Dispatch<React.SetStateAction<boolean>>" to "react.StateSetter<Boolean>",
 
     "React.ReactElement" to "react.ReactElement<*>",
+    "React.ReactElement<any>" to "react.ReactElement<*>",
     "React.ReactElement<any, any>" to "react.ReactElement<*>",
     "NonNullable<React.ReactElement>" to "react.ReactElement<*>",
 

diff --git a/buildSrc/src/main/kotlin/karakum/mui/Override.kt b/buildSrc/src/main/kotlin/karakum/mui/Override.kt
@@ -46,6 +46,7 @@ internal val OVERRIDE_FIX_REQUIRED = setOf(
 )
 
 internal val VAR_TYPE_MISMATCH_ON_OVERRIDE_FIX_REQUIRED = setOf(
+    "AlertTitle",
     "CardHeader",
     "BottomNavigationAction",
     "StepButton",

diff --git a/buildSrc/src/main/kotlin/karakum/mui/Overrides.kt b/buildSrc/src/main/kotlin/karakum/mui/Overrides.kt
@@ -5,6 +5,10 @@ internal fun fixOverrides(
     content: String,
 ): String =
     when (name) {
+        "AlertTitle",
+        -> content
+            .override("classes")
+
         "Autocomplete",
         -> content
             .override("disabled")

diff --git a/buildSrc/src/main/kotlin/karakum/mui/ParentType.kt b/buildSrc/src/main/kotlin/karakum/mui/ParentType.kt
@@ -54,6 +54,11 @@ internal fun findParentType(
         ).joinToString(",", "\n")
     }
 
+    if (parentSource.startsWith("TypographyProps<")) {
+        val (first, _) = parentSource.split("<")
+        return first
+    }
+
     return when (parentSource) {
         "ButtonBaseProps",
         "ListItemBaseProps",

diff --git a/buildSrc/src/main/kotlin/karakum/mui/adapters/Option.kt b/buildSrc/src/main/kotlin/karakum/mui/adapters/Option.kt
@@ -15,7 +15,7 @@ export interface OptionTypeMap<OptionValue, AdditionalProps = {}, RootComponentT
         ).replace(
             """
 export interface OptionType {
-    <OptionValue, RootComponentType extends React.ElementType = OptionTypeMap<OptionValue>['defaultComponent']>(props: PolymorphicProps<OptionTypeMap<OptionValue>, RootComponentType>): JSX.Element | null;
+    <OptionValue, RootComponentType extends React.ElementType = OptionTypeMap<OptionValue>['defaultComponent']>(props: PolymorphicProps<OptionTypeMap<OptionValue>, RootComponentType>): React.JSX.Element | null;
     propTypes?: any;
     displayName?: string | undefined;
 }

diff --git a/buildSrc/src/main/kotlin/karakum/mui/adapters/Select.kt b/buildSrc/src/main/kotlin/karakum/mui/adapters/Select.kt
@@ -23,7 +23,7 @@ export interface SelectTypeMap<OptionValue extends {}, Multiple extends boolean,
     ).replace(
         """
 export interface SelectType {
-    <OptionValue extends {}, Multiple extends boolean = false, RootComponentType extends React.ElementType = SelectTypeMap<OptionValue, Multiple>['defaultComponent']>(props: PolymorphicProps<SelectTypeMap<OptionValue, Multiple>, RootComponentType>): JSX.Element | null;
+    <OptionValue extends {}, Multiple extends boolean = false, RootComponentType extends React.ElementType = SelectTypeMap<OptionValue, Multiple>['defaultComponent']>(props: PolymorphicProps<SelectTypeMap<OptionValue, Multiple>, RootComponentType>): React.JSX.Element | null;
     propTypes?: any;
     displayName?: string | undefined;
 }

diff --git a/buildSrc/src/main/kotlin/karakum/mui/adapters/useAutocomplete.kt b/buildSrc/src/main/kotlin/karakum/mui/adapters/useAutocomplete.kt
@@ -3,17 +3,22 @@ package karakum.mui.adapters
 // TODO: Remove when default function for `useAutocomplete` will be supported
 fun String.adaptUseAutocomplete(): String {
     return replace(
-        """export interface UseAutocompleteParameters<
+        oldValue = """export interface UseAutocompleteParameters<
   Value,
   Multiple extends boolean | undefined,
   DisableClearable extends boolean | undefined,
   FreeSolo extends boolean | undefined,
 > extends UseAutocompleteProps<Value, Multiple, DisableClearable, FreeSolo> {}""",
-        "",
-    ).replace(
-        "  getInputProps: () => React.InputHTMLAttributes<HTMLInputElement> & {\n" +
-                "    ref: React.Ref<HTMLInputElement>;\n" +
-                "  };",
-        "  getInputProps: () => React.InputHTMLAttributes<HTMLInputElement>;"
+        newValue = "",
     )
+        .replace(
+            oldValue = "  getInputProps: () => React.InputHTMLAttributes<HTMLInputElement> & {\n" +
+                    "    ref: React.Ref<HTMLInputElement>;\n" +
+                    "  };",
+            newValue = "  getInputProps: () => React.InputHTMLAttributes<HTMLInputElement>;"
+        )
+        .replace(
+            oldValue = "React.HTMLAttributes<HTMLLIElement> & { key: any }",
+            newValue = "React.HTMLAttributes<HTMLLIElement>",
+        )
 }
diff --git a/gradle.properties b/gradle.properties
@@ -4,9 +4,9 @@ kotlin-wrappers.version=1.0.0-pre.754
 kfc.version=8.1.0
 seskar.version=2.80.0
 # MUI Deps
-mui-material.version=5.15.18
-mui-icons-material.version=5.15.18
-mui-base.version=5.0.0-beta.45
+mui-material.version=5.15.19
+mui-icons-material.version=5.15.19
+mui-base.version=5.0.0-beta.47
 mui-system.version=5.15.15
 mui-lab.version=5.0.0-alpha.170
 mui-x-date-pickers.version=5.0.20

diff --git a/mui-kotlin/src/jsMain/kotlin/mui/material/AlertTitle.kt b/mui-kotlin/src/jsMain/kotlin/mui/material/AlertTitle.kt
@@ -2,14 +2,17 @@
 
 @file:JsModule("@mui/material/AlertTitle")
 
+@file:Suppress(
+    "VAR_TYPE_MISMATCH_ON_OVERRIDE",
+)
+
 package mui.material
 
 import mui.material.styles.Theme
 import mui.system.SxProps
 
 external interface AlertTitleProps :
-    mui.system.StandardProps,
-    react.dom.html.HTMLAttributes<web.html.HTMLDivElement>,
+    TypographyProps,
     react.PropsWithChildren,
     mui.system.PropsWithSx {
     /**
@@ -20,7 +23,7 @@ external interface AlertTitleProps :
     /**
      * Override or extend the styles applied to the component.
      */
-    var classes: AlertTitleClasses?
+    override var classes: AlertTitleClasses?
 
     /**
      * The system prop that allows defining system overrides as well as additional CSS styles.

diff --git a/mui-kotlin/src/jsMain/kotlin/mui/material/Hidden.kt b/mui-kotlin/src/jsMain/kotlin/mui/material/Hidden.kt
@@ -106,6 +106,8 @@ external interface HiddenProps : react.PropsWithChildren {
  * API:
  *
  * - [Hidden API](https://mui.com/material-ui/api/hidden/)
+ *
+ * @deprecated The Hidden component was deprecated in Material UI v5. To learn more, see [the Hidden section](/material-ui/migration/v5-component-changes/#hidden) of the migration docs.
  */
 @JsName("default")
 external val Hidden: react.FC<HiddenProps>
diff --git a/mui-kotlin/src/jsMain/kotlin/mui/material/usePagination.kt b/mui-kotlin/src/jsMain/kotlin/mui/material/usePagination.kt
@@ -57,7 +57,7 @@ external interface UsePaginationProps : react.Props {
     var onChange: ((event: react.dom.events.ChangeEvent<*>, page: Number) -> Unit)?
 
     /**
-     * The current page.
+     * The current page. Unlike `TablePagination`, which starts numbering from `0`, this pagination starts from `1`.
      */
     var page: Number?