diff --git a/buildSrc/src/main/kotlin/karakum/mui/Adapter.kt b/buildSrc/src/main/kotlin/karakum/mui/Adapter.kt index c43b4a00f..c1dd5a94a 100644 --- a/buildSrc/src/main/kotlin/karakum/mui/Adapter.kt +++ b/buildSrc/src/main/kotlin/karakum/mui/Adapter.kt @@ -9,6 +9,7 @@ fun String.adaptRawContent(): String = .adaptSelect() .adaptFormControl() .adaptModal() + .adaptAccordion() .adaptAutocomplete() .adaptUseAutocomplete() .adaptBreadcrumbs() diff --git a/buildSrc/src/main/kotlin/karakum/mui/adapters/Accordion.kt b/buildSrc/src/main/kotlin/karakum/mui/adapters/Accordion.kt new file mode 100644 index 000000000..c0a61f3a1 --- /dev/null +++ b/buildSrc/src/main/kotlin/karakum/mui/adapters/Accordion.kt @@ -0,0 +1,7 @@ +package karakum.mui.adapters + +fun String.adaptAccordion(): String = + replace( + oldValue = "export interface AccordionOwnerState extends AccordionProps {}", + newValue = "", + ) diff --git a/gradle.properties b/gradle.properties index e949d3adb..bdfb2dd9b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,11 +5,11 @@ kfc.version=7.34.0 # TEMP kfc.es.mode=false seskar.version=2.23.0 -mui-material.version=5.15.4 -mui-icons-material.version=5.15.4 -mui-base.version=5.0.0-beta.31 -mui-system.version=5.15.4 -mui-lab.version=5.0.0-alpha.160 +mui-material.version=5.15.5 +mui-icons-material.version=5.15.5 +mui-base.version=5.0.0-beta.32 +mui-system.version=5.15.5 +mui-lab.version=5.0.0-alpha.161 mui-x-tree-view.version=6.17.0 mui-x-date-pickers.version=5.0.4 kotlin-wrappers.version=1.0.0-pre.684 diff --git a/mui-kotlin/src/jsMain/kotlin/mui/base/Input.types.kt b/mui-kotlin/src/jsMain/kotlin/mui/base/Input.types.kt index d2b988f33..c69085961 100644 --- a/mui-kotlin/src/jsMain/kotlin/mui/base/Input.types.kt +++ b/mui-kotlin/src/jsMain/kotlin/mui/base/Input.types.kt @@ -70,7 +70,7 @@ external interface InputOwnProps : var endAdornment: react.ReactNode? /** - * If `true`, the `input` will indicate an error by setting the `aria-invalid` attribute on the input and the `Mui-error` class on the root element. + * If `true`, the `input` will indicate an error by setting the `aria-invalid` attribute on the input and the `baseui--error` class on the root element. * The prop defaults to the value (`false`) inherited from the parent FormControl component. */ var error: Boolean? diff --git a/mui-kotlin/src/jsMain/kotlin/mui/material/Accordion.kt b/mui-kotlin/src/jsMain/kotlin/mui/material/Accordion.kt index 374c0ab52..c35309d71 100644 --- a/mui-kotlin/src/jsMain/kotlin/mui/material/Accordion.kt +++ b/mui-kotlin/src/jsMain/kotlin/mui/material/Accordion.kt @@ -67,17 +67,27 @@ external interface AccordionProps : /** * The component used for the transition. * [Follow this guide](/material-ui/transitions/#transitioncomponent-prop) to learn more about the requirements for this component. - * @default Collapse + * @deprecated Use `slots.transition` instead. This prop will be removed in v7. */ var TransitionComponent: react.ComponentType<*>? /** * Props applied to the transition element. * By default, the element is based on this [`Transition`](http://reactcommunity.org/react-transition-group/transition/) component. + * @deprecated Use `slotProps.transition` instead. This prop will be removed in v7. */ var TransitionProps: mui.material.transitions.TransitionProps? } +external interface AccordionSlots { + /** + * The component that renders the transition. + * [Follow this guide](/material-ui/transitions/#transitioncomponent-prop) to learn more about the requirements for this component. + * @default Collapse + */ + var transition: react.ComponentType<*>? +} + /** * * Demos: diff --git a/mui-kotlin/src/jsMain/kotlin/mui/material/AccordionSummary.classes.kt b/mui-kotlin/src/jsMain/kotlin/mui/material/AccordionSummary.classes.kt index dd9aa569b..4c74e1506 100644 --- a/mui-kotlin/src/jsMain/kotlin/mui/material/AccordionSummary.classes.kt +++ b/mui-kotlin/src/jsMain/kotlin/mui/material/AccordionSummary.classes.kt @@ -20,7 +20,10 @@ external interface AccordionSummaryClasses { /** Styles applied to the root element unless `disableGutters={true}`. */ var gutters: ClassName - /** Styles applied to the children wrapper element unless `disableGutters={true}`. */ + /** + * Styles applied to the children wrapper element unless `disableGutters={true}`. + * @deprecated Combine the [.MuiAccordionSummary-gutters](/material-ui/api/accordion-summary/#AccordionSummary-classes-gutters) and [.MuiAccordionSummary-content](/material-ui/api/accordion-summary/#AccordionSummary-classes-content) classes instead. + */ var contentGutters: ClassName /** Styles applied to the children wrapper element. */ diff --git a/mui-kotlin/src/jsMain/kotlin/mui/material/Alert.kt b/mui-kotlin/src/jsMain/kotlin/mui/material/Alert.kt index ee875a63f..aa0aef8f0 100644 --- a/mui-kotlin/src/jsMain/kotlin/mui/material/Alert.kt +++ b/mui-kotlin/src/jsMain/kotlin/mui/material/Alert.kt @@ -75,7 +75,7 @@ external interface AlertProps : * The severity of the alert. This defines the color and icon used. * @default 'success' */ - var severity: AlertColor? + var severity: mui.system.Union? /* AlertColor, AlertPropsColorOverrides */ /** * Override the icon displayed before the children. diff --git a/mui-kotlin/src/jsMain/kotlin/mui/material/Divider.classes.kt b/mui-kotlin/src/jsMain/kotlin/mui/material/Divider.classes.kt index 49938ad40..d063c0b83 100644 --- a/mui-kotlin/src/jsMain/kotlin/mui/material/Divider.classes.kt +++ b/mui-kotlin/src/jsMain/kotlin/mui/material/Divider.classes.kt @@ -17,7 +17,9 @@ external interface DividerClasses { /** Styles applied to the root element if `variant="fullWidth"`. */ var fullWidth: ClassName - /** Styles applied to the root element if `light={true}`. */ + /** Styles applied to the root element if `light={true}`. + * @deprecated + */ var light: ClassName /** Styles applied to the root element if `variant="middle"`. */ @@ -32,7 +34,9 @@ external interface DividerClasses { /** Styles applied to the root element if divider have text. */ var withChildren: ClassName - /** Styles applied to the root element if divider have text and `orientation="vertical"`. */ + /** Styles applied to the root element if divider have text and `orientation="vertical"`. + * @deprecated Combine the [.MuiDivider-withChildren](/material-ui/api/divider/#divider-classes-withChildren) and [.MuiDivider-vertical](/material-ui/api/divider/#divider-classes-vertical) classes instead. + */ var withChildrenVertical: ClassName /** Styles applied to the root element if `textAlign="right" orientation="horizontal"`. */ diff --git a/mui-kotlin/src/jsMain/kotlin/mui/material/Divider.kt b/mui-kotlin/src/jsMain/kotlin/mui/material/Divider.kt index 4d998b290..9c93850e4 100644 --- a/mui-kotlin/src/jsMain/kotlin/mui/material/Divider.kt +++ b/mui-kotlin/src/jsMain/kotlin/mui/material/Divider.kt @@ -41,6 +41,7 @@ external interface DividerOwnProps : /** * If `true`, the divider will have a lighter color. * @default false + * @deprecated Use (or any color) instead. */ var light: Boolean? diff --git a/yarn.lock b/yarn.lock index 02b1f6f03..388739f50 100644 --- a/yarn.lock +++ b/yarn.lock @@ -36,7 +36,7 @@ chalk "^2.4.2" js-tokens "^4.0.0" -"@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.7", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7": +"@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.7", "@babel/runtime@^7.23.8", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7": version "7.23.8" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.8.tgz#8ee6fe1ac47add7122902f257b8ddf55c898f650" integrity sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw== @@ -267,7 +267,20 @@ resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== -"@mui/base@5.0.0-beta.31", "@mui/base@^5.0.0-beta.20": +"@mui/base@5.0.0-beta.32": + version "5.0.0-beta.32" + resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.32.tgz#cdda6c68389f0b8b39a5bff7ed16e40788aed510" + integrity sha512-4VptvYeLUYMJhZapWBkD50GmKfOc0XT381KJcTK3ncZYIl8MdBhpR6l8jOyeP5cixUPBJhstjrnmQEAHjCLriw== + dependencies: + "@babel/runtime" "^7.23.8" + "@floating-ui/react-dom" "^2.0.5" + "@mui/types" "^7.2.13" + "@mui/utils" "^5.15.5" + "@popperjs/core" "^2.11.8" + clsx "^2.1.0" + prop-types "^15.8.1" + +"@mui/base@^5.0.0-beta.20": version "5.0.0-beta.31" resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.31.tgz#80293893e6bf41ffb51e4ce8d6498e3fc70ca415" integrity sha512-+uNbP3OHJuZVI00WyMg7xfLZotaEY7LgvYXDfONVJbrS+K9wyjCIPNfjy8r9XJn4fbHo/5ibiZqjWnU9LMNv+A== @@ -280,42 +293,42 @@ clsx "^2.1.0" prop-types "^15.8.1" -"@mui/core-downloads-tracker@^5.15.4": - version "5.15.4" - resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.15.4.tgz#c9430f1786ff604c2afaa00508b5bc45c9726c13" - integrity sha512-0OZN9O6hAtBpx70mMNFOPaAIol/ytwZYPY+z7Rf9dK3+1Xlzwvj5/IeShJKvtp76S1qJyhPuvZg0+BGqQaUnUw== +"@mui/core-downloads-tracker@^5.15.5": + version "5.15.5" + resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.15.5.tgz#e8e060133ea0e92b1c0e30c441522cab37d0be79" + integrity sha512-VhT8klyXy8GrWrARqLMoM6Nzz809Jc3Wn5wd7WOZfre2vFO1rBV1dBANAPBhBqpaQI0HCMRTWEYoSyOFgRnz4A== -"@mui/icons-material@5.15.4": - version "5.15.4" - resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.15.4.tgz#fb8a5e4be2cd656c5d5b1bbad7618b3fadf8d37b" - integrity sha512-q/Yk7aokN8qGMpR7bwoDpBSeaNe6Bv7vaY9yHYodP37c64TM6ime05ueb/wgksOVszrKkNXC67E/XYbRWOoUFA== +"@mui/icons-material@5.15.5": + version "5.15.5" + resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.15.5.tgz#2a2abeadcc5cc6acdfc1d002c252b43a22edff18" + integrity sha512-qiql0fd1JY7TZ1wm1RldvU7sL8QUatE9OC12i/qm5rnm/caTFyAfOyTIR7qqxorsJvoZGyrzwoMkal6Ij9kM0A== dependencies: - "@babel/runtime" "^7.23.7" + "@babel/runtime" "^7.23.8" -"@mui/lab@5.0.0-alpha.160": - version "5.0.0-alpha.160" - resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-5.0.0-alpha.160.tgz#1e0ecfa28db57811697ca8177c53b67e66777da1" - integrity sha512-hMCOyjfpCHrb/ELs45baCHXICaZf3ygKY0R/phBKxxCxAX6V6Y3O9hxu2fS/Uw3LflZqUuv9TFkwVEWzq3OUkQ== +"@mui/lab@5.0.0-alpha.161": + version "5.0.0-alpha.161" + resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-5.0.0-alpha.161.tgz#bd4f05a5620016aebc0ac59ca49b067997d4593e" + integrity sha512-dLWWZrJAi44av+iiqEHpZHfPhZ4DM42ItS31yqBwboroawumG2GUyYvHVTyEFXM1Zr8+kufiZ9t28rqHXVf5+w== dependencies: - "@babel/runtime" "^7.23.7" - "@mui/base" "5.0.0-beta.31" - "@mui/system" "^5.15.4" + "@babel/runtime" "^7.23.8" + "@mui/base" "5.0.0-beta.32" + "@mui/system" "^5.15.5" "@mui/types" "^7.2.13" - "@mui/utils" "^5.15.4" + "@mui/utils" "^5.15.5" clsx "^2.1.0" prop-types "^15.8.1" -"@mui/material@5.15.4": - version "5.15.4" - resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.15.4.tgz#354e0972fc89207926e9e53cc9cb349049873517" - integrity sha512-T/LGRAC+M0c+D3+y67eHwIN5bSje0TxbcJCWR0esNvU11T0QwrX3jedXItPNBwMupF2F5VWCDHBVLlFnN3+ABA== +"@mui/material@5.15.5": + version "5.15.5" + resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.15.5.tgz#5c672ddf17fbe1a1d6a8854ddbb8502cc83feec0" + integrity sha512-2KfA39f/UWeQl0O22UJs3x1nG3chYlyu9wnux5vTnxUTLzkgYIzQIHaH+ZOGpv5JiZBMKktAPNfhqyhSaQ49qQ== dependencies: - "@babel/runtime" "^7.23.7" - "@mui/base" "5.0.0-beta.31" - "@mui/core-downloads-tracker" "^5.15.4" - "@mui/system" "^5.15.4" + "@babel/runtime" "^7.23.8" + "@mui/base" "5.0.0-beta.32" + "@mui/core-downloads-tracker" "^5.15.5" + "@mui/system" "^5.15.5" "@mui/types" "^7.2.13" - "@mui/utils" "^5.15.4" + "@mui/utils" "^5.15.5" "@types/react-transition-group" "^4.4.10" clsx "^2.1.0" csstype "^3.1.2" @@ -323,35 +336,35 @@ react-is "^18.2.0" react-transition-group "^4.4.5" -"@mui/private-theming@^5.15.4": - version "5.15.4" - resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.15.4.tgz#5d7b187e8e31995289b63ec4e0331d1e29859d6c" - integrity sha512-9N5myIMEEQTM5WYWPGvvYADzjFo12LgJ7S+2iTZkBNOcJpUxQYM1tvYjkHCDV+t1ocMOEgjR2EfJ9Dus30dBlg== +"@mui/private-theming@^5.15.5": + version "5.15.5" + resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.15.5.tgz#3f81e77ecff49bc12301922e82b942748b1f6c7c" + integrity sha512-HU1KCyGNcJFsUamTbOM539ZDZJNI/XU7sZFdsN29glktUf+T6hNvDuO2ISinBiLTZy7Ab3R6DSSoYXRrLc4uwQ== dependencies: - "@babel/runtime" "^7.23.7" - "@mui/utils" "^5.15.4" + "@babel/runtime" "^7.23.8" + "@mui/utils" "^5.15.5" prop-types "^15.8.1" -"@mui/styled-engine@^5.15.4": - version "5.15.4" - resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.15.4.tgz#2e7bbf9154eba4db34f77aa55a6468408b31fb1d" - integrity sha512-vtrZUXG5XI8CNiNLcxjIirW4dEbOloR+ikfm6ePBo7jXpJdpXjVzBWetrfE+5eI0cHkKWlTptnJ2voKV8pBRfw== +"@mui/styled-engine@^5.15.5": + version "5.15.5" + resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.15.5.tgz#c5e0113282c28a8d7580371881c36e1baec86217" + integrity sha512-xoMUd8h270thNL7ZsOzmlluIAMsQg/HT7SCdRjPBVle+XHgTKaiWiRy1ekDOsrrF0rhjME3T7xeeUq2G269UUw== dependencies: - "@babel/runtime" "^7.23.7" + "@babel/runtime" "^7.23.8" "@emotion/cache" "^11.11.0" csstype "^3.1.2" prop-types "^15.8.1" -"@mui/system@5.15.4", "@mui/system@^5.15.4": - version "5.15.4" - resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.15.4.tgz#750342dd699881cd81c99ea0ea770387d5ac35aa" - integrity sha512-KCwkHajGBXPs2TK1HJjIyab4NDk0cZoBDYN/TTlXVo1qBAmCjY0vjqrlsjeoG+wrwwcezXMLs/e6OGP66fPCog== +"@mui/system@5.15.5", "@mui/system@^5.15.5": + version "5.15.5" + resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.15.5.tgz#dc3fd3e5636a6c238d46e0ba40ada9f213a128a5" + integrity sha512-DMv2vGjUKaDt/m0RlzvLjpKiS5V0LoBhiMUHf5pWdj6uoNlN4FuKUe4pFeYmQMIO5DnVZKybmpPepfkdfEH+Og== dependencies: - "@babel/runtime" "^7.23.7" - "@mui/private-theming" "^5.15.4" - "@mui/styled-engine" "^5.15.4" + "@babel/runtime" "^7.23.8" + "@mui/private-theming" "^5.15.5" + "@mui/styled-engine" "^5.15.5" "@mui/types" "^7.2.13" - "@mui/utils" "^5.15.4" + "@mui/utils" "^5.15.5" clsx "^2.1.0" csstype "^3.1.2" prop-types "^15.8.1" @@ -371,6 +384,16 @@ prop-types "^15.8.1" react-is "^18.2.0" +"@mui/utils@^5.15.5": + version "5.15.5" + resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.15.5.tgz#4033a27e954ae443d0356f625e0c17f4cf32164b" + integrity sha512-jEywgaMGZWPSlVFO7ZZAyXxNeLmq5XBp5At9Ne/sGohRJdesUcdxvyi8TP3odJxwQuL5L6PJV+JQ4DyIDM849A== + dependencies: + "@babel/runtime" "^7.23.8" + "@types/prop-types" "^15.7.11" + prop-types "^15.8.1" + react-is "^18.2.0" + "@mui/x-date-pickers@5.0.4": version "5.0.4" resolved "https://registry.yarnpkg.com/@mui/x-date-pickers/-/x-date-pickers-5.0.4.tgz#79a509354eea4bedaa955ee52f37d80256d7e415"