Skip to content

Commit

Permalink
Upgrade MUI & Regenerate declarations
Browse files Browse the repository at this point in the history
* Material `5.15.6`
* Icons `5.15.6`
* Base `5.0.0-beta.33`
* System `5.15.6`
* Lab `5.0.0-alpha.162`
  • Loading branch information
aerialist7 committed Jan 25, 2024
1 parent 20a327c commit f8b6564
Show file tree
Hide file tree
Showing 9 changed files with 106 additions and 65 deletions.
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ kfc.version=7.34.0
# TEMP
kfc.es.mode=false
seskar.version=2.23.0
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-material.version=5.15.6
mui-icons-material.version=5.15.6
mui-base.version=5.0.0-beta.33
mui-system.version=5.15.6
mui-lab.version=5.0.0-alpha.162
mui-x-date-pickers.version=5.0.20
mui-x-tree-view.version=6.17.0
kotlin-wrappers.version=1.0.0-pre.684
8 changes: 0 additions & 8 deletions mui-kotlin/src/jsMain/kotlin/mui/base/CssTransition.kt
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,6 @@ external interface CssTransitionProps :
*/
var exitClassName: ClassName?

/**
* The name of the CSS property that is transitioned the longest (has the largest `transition-duration`) on enter.
* This is used to determine when the transition has ended.
* If not specified, the transition will be considered finished end when the first property is transitioned.
* If all properties have the same `transition-duration` (or there is just one transitioned property), this can be omitted.
*/
var lastTransitionedPropertyOnEnter: String?

/**
* The name of the CSS property that is transitioned the longest (has the largest `transition-duration`) on exit.
* This is used to determine when the transition has ended.
Expand Down
2 changes: 1 addition & 1 deletion mui-kotlin/src/jsMain/kotlin/mui/base/Select.classes.kt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ external interface SelectClasses {
var listbox: ClassName

/** Class name applied to the popper element. */
var popper: ClassName
var popup: ClassName

/** State class applied to the root `button` element if `active={true}`. */
var active: ClassName
Expand Down
4 changes: 2 additions & 2 deletions mui-kotlin/src/jsMain/kotlin/mui/base/Select.mui.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ sealed external interface MuiSelect {
@JsValue("MuiSelect-listbox")
val listbox: ClassName

@JsValue("MuiSelect-popper")
val popper: ClassName
@JsValue("MuiSelect-popup")
val popup: ClassName
}
}
8 changes: 4 additions & 4 deletions mui-kotlin/src/jsMain/kotlin/mui/base/Select.types.kt
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ external interface SelectOwnProps<OptionValue> :
interface SlotProps {
var root: react.Props? /* SlotComponentProps<'button', SelectRootSlotPropsOverrides, SelectOwnerState<OptionValue, Multiple>> */
var listbox: react.Props? /* SlotComponentProps<'ul', SelectListboxSlotPropsOverrides, SelectOwnerState<OptionValue, Multiple>> */
var popper: react.Props? /* SlotComponentProps<typeof Popper, SelectPopperSlotPropsOverrides, SelectOwnerState<OptionValue, Multiple>> */
var popup: react.Props? /* SlotComponentProps<'div', SelectPopupSlotPropsOverrides & PopupProps, SelectOwnerState<OptionValue, Multiple>> */
}

/**
Expand Down Expand Up @@ -162,8 +162,8 @@ external interface SelectSlots {
var listbox: react.ElementType<*>?

/**
* The component that renders the popper.
* @default Popper
* The component that wraps the popup.
* @default 'div'
*/
var popper: react.ComponentType<*>?
var popup: react.ElementType<*>?
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,31 @@ external interface PaginationItemClasses {
/** Styles applied to the root element if `variant="text"`. */
var text: ClassName

/** Styles applied to the root element if `variant="text"` and `color="primary"`. */
/** Styles applied to the root element if `variant="text"` and `color="primary"`.
* @deprecated Combine the [.MuiPaginationItem-text](/material-ui/api/pagination-item/#pagination-item-classes-text)
* and [.MuiPaginationItem-colorPrimary](/material-ui/api/pagination-item/#pagination-item-classes-colorPrimary) classes instead.
*/
var textPrimary: ClassName

/** Styles applied to the root element if `variant="text"` and `color="secondary"`. */
/** Styles applied to the root element if `variant="text"` and `color="secondary"`.
* @deprecated Combine the [.MuiPaginationItem-text](/material-ui/api/pagination-item/#pagination-item-classes-text)
* and [.MuiPaginationItem-colorSecondary](/material-ui/api/pagination-item/#pagination-item-classes-colorSecondary) classes instead.
*/
var textSecondary: ClassName

/** Styles applied to the root element if `variant="outlined"`. */
var outlined: ClassName

/** Styles applied to the root element if `variant="outlined"` and `color="primary"`. */
/** Styles applied to the root element if `variant="outlined"` and `color="primary"`.
* @deprecated Combine the [.MuiPaginationItem-outlined](/material-ui/api/pagination-item/#pagination-item-classes-outlined)
* and [.MuiPaginationItem-colorPrimary](/material-ui/api/pagination-item/#pagination-item-classes-colorPrimary) classes instead.
*/
var outlinedPrimary: ClassName

/** Styles applied to the root element if `variant="outlined"` and `color="secondary"`. */
/** Styles applied to the root element if `variant="outlined"` and `color="secondary"`.
* @deprecated Combine the [.MuiPaginationItem-outlined](/material-ui/api/pagination-item/#pagination-item-classes-outlined)
* and [.MuiPaginationItem-colorSecondary](/material-ui/api/pagination-item/#pagination-item-classes-colorSecondary) classes instead.
*/
var outlinedSecondary: ClassName

/** Styles applied to the root element if `rounded="true"`. */
Expand All @@ -58,4 +70,10 @@ external interface PaginationItemClasses {

/** Styles applied to the icon to display. */
var icon: ClassName

/** Styles applied to the root element if `color="primary"`. */
var colorPrimary: ClassName

/** Styles applied to the root element if `color="secondary"`. */
var colorSecondary: ClassName
}
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,11 @@ sealed external interface MuiPaginationItem {

@JsValue("MuiPaginationItem-icon")
val icon: ClassName

@JsValue("MuiPaginationItem-colorPrimary")
val colorPrimary: ClassName

@JsValue("MuiPaginationItem-colorSecondary")
val colorSecondary: ClassName
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ external interface Theme : BaseTheme {
override var unstable_sx: (props: SxProps<Theme>) -> dynamic /* CSSObject from `@mui/styled-engine` */

override var unstable_sxConfig: dynamic

var applyDarkStyles: (css: dynamic /* CSSObject from `@mui/styled-engine` */) -> dynamic /* CSSObject from `@mui/styled-engine` */
}

@JsName("default")
Expand Down
105 changes: 64 additions & 41 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
"@floating-ui/core" "^1.5.3"
"@floating-ui/utils" "^0.2.0"

"@floating-ui/react-dom@^2.0.5":
"@floating-ui/react-dom@^2.0.5", "@floating-ui/react-dom@^2.0.6":
version "2.0.6"
resolved "https://registry.yarnpkg.com/@floating-ui/react-dom/-/react-dom-2.0.6.tgz#5ffcf40b6550817a973b54cdd443374f51ca7a5c"
integrity sha512-IB8aCRFxr8nFkdYZgH+Otd9EVQPJoynxeFRGTB8voPoZMRWo8XjYuCRgpI1btvuKY69XMiLnW+ym7zoBHM90Rw==
Expand Down Expand Up @@ -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/[email protected]", "@mui/base@^5.0.0-beta.20":
"@mui/[email protected]":
version "5.0.0-beta.33"
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.33.tgz#fbb844e2d840d47dd7a48850a03152aed2381d10"
integrity sha512-WcSpoJUw/UYHXpvgtl4HyMar2Ar97illUpqiS/X1gtSBp6sdDW6kB2BJ9OlVQ+Kk/RL2GDp/WHA9sbjAYV35ow==
dependencies:
"@babel/runtime" "^7.23.8"
"@floating-ui/react-dom" "^2.0.6"
"@mui/types" "^7.2.13"
"@mui/utils" "^5.15.6"
"@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.32"
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.32.tgz#cdda6c68389f0b8b39a5bff7ed16e40788aed510"
integrity sha512-4VptvYeLUYMJhZapWBkD50GmKfOc0XT381KJcTK3ncZYIl8MdBhpR6l8jOyeP5cixUPBJhstjrnmQEAHjCLriw==
Expand All @@ -280,78 +293,78 @@
clsx "^2.1.0"
prop-types "^15.8.1"

"@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/core-downloads-tracker@^5.15.6":
version "5.15.6"
resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.15.6.tgz#9b82ba86d5a0fe55e9479b68dd5068943cc3835b"
integrity sha512-0aoWS4qvk1uzm9JBs83oQmIMIQeTBUeqqu8u+3uo2tMznrB5fIKqQVCbCgq+4Tm4jG+5F7dIvnjvQ2aV7UKtdw==

"@mui/[email protected].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==
"@mui/[email protected].6":
version "5.15.6"
resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.15.6.tgz#6958232bef48972fcbafd5f69e6079a9be5951f1"
integrity sha512-GnkxMtlhs+8ieHLmCytg00ew0vMOiXGFCw8Ra9nxMsBjBqnrOI5gmXqUm+sGggeEU/HG8HyeqC1MX/IxOBJHzA==
dependencies:
"@babel/runtime" "^7.23.8"

"@mui/[email protected].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==
"@mui/[email protected].162":
version "5.0.0-alpha.162"
resolved "https://registry.yarnpkg.com/@mui/lab/-/lab-5.0.0-alpha.162.tgz#f7b4ddef46f796760a1f667f444060b3984fb3ab"
integrity sha512-nSdlhq1YVozKXn6mtItWmnU9b/gQ708RSWG6C+M/Y096MlQ7Mz1gdNWOEwcGw2HaNoNgDvuG0+0HKARAMIMaLg==
dependencies:
"@babel/runtime" "^7.23.8"
"@mui/base" "5.0.0-beta.32"
"@mui/system" "^5.15.5"
"@mui/base" "5.0.0-beta.33"
"@mui/system" "^5.15.6"
"@mui/types" "^7.2.13"
"@mui/utils" "^5.15.5"
"@mui/utils" "^5.15.6"
clsx "^2.1.0"
prop-types "^15.8.1"

"@mui/[email protected].5":
version "5.15.5"
resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.15.5.tgz#5c672ddf17fbe1a1d6a8854ddbb8502cc83feec0"
integrity sha512-2KfA39f/UWeQl0O22UJs3x1nG3chYlyu9wnux5vTnxUTLzkgYIzQIHaH+ZOGpv5JiZBMKktAPNfhqyhSaQ49qQ==
"@mui/[email protected].6":
version "5.15.6"
resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.15.6.tgz#e32944ae4e01f85b314bc26e4cbbb700d598f30c"
integrity sha512-rw7bDdpi2kzfmcDN78lHp8swArJ5sBCKsn+4G3IpGfu44ycyWAWX0VdlvkjcR9Yrws2KIm7c+8niXpWHUDbWoA==
dependencies:
"@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/base" "5.0.0-beta.33"
"@mui/core-downloads-tracker" "^5.15.6"
"@mui/system" "^5.15.6"
"@mui/types" "^7.2.13"
"@mui/utils" "^5.15.5"
"@mui/utils" "^5.15.6"
"@types/react-transition-group" "^4.4.10"
clsx "^2.1.0"
csstype "^3.1.2"
prop-types "^15.8.1"
react-is "^18.2.0"
react-transition-group "^4.4.5"

"@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==
"@mui/private-theming@^5.15.6":
version "5.15.6"
resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.15.6.tgz#224819694ed76df041b1257256152a45d1fd733d"
integrity sha512-ZBX9E6VNUSscUOtU8uU462VvpvBS7eFl5VfxAzTRVQBHflzL+5KtnGrebgf6Nd6cdvxa1o0OomiaxSKoN2XDmg==
dependencies:
"@babel/runtime" "^7.23.8"
"@mui/utils" "^5.15.5"
"@mui/utils" "^5.15.6"
prop-types "^15.8.1"

"@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==
"@mui/styled-engine@^5.15.6":
version "5.15.6"
resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.15.6.tgz#3f4a8804de6ddeee17cb52ec92225686f423398a"
integrity sha512-KAn8P8xP/WigFKMlEYUpU9z2o7jJnv0BG28Qu1dhNQVutsLVIFdRf5Nb+0ijp2qgtcmygQ0FtfRuXv5LYetZTg==
dependencies:
"@babel/runtime" "^7.23.8"
"@emotion/cache" "^11.11.0"
csstype "^3.1.2"
prop-types "^15.8.1"

"@mui/[email protected].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==
"@mui/[email protected].6", "@mui/system@^5.15.6":
version "5.15.6"
resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.15.6.tgz#d278adb09d57ee21f4eef2f6bc335bf9bd062fca"
integrity sha512-J01D//u8IfXvaEHMBQX5aO2l7Q+P15nt96c4NskX7yp5/+UuZP8XCQJhtBtLuj+M2LLyXHYGmCPeblsmmscP2Q==
dependencies:
"@babel/runtime" "^7.23.8"
"@mui/private-theming" "^5.15.5"
"@mui/styled-engine" "^5.15.5"
"@mui/private-theming" "^5.15.6"
"@mui/styled-engine" "^5.15.6"
"@mui/types" "^7.2.13"
"@mui/utils" "^5.15.5"
"@mui/utils" "^5.15.6"
clsx "^2.1.0"
csstype "^3.1.2"
prop-types "^15.8.1"
Expand All @@ -371,6 +384,16 @@
prop-types "^15.8.1"
react-is "^18.2.0"

"@mui/utils@^5.15.6":
version "5.15.6"
resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.15.6.tgz#bbcc302b8e83e360a87230afe3ed8fc99e29fae9"
integrity sha512-qfEhf+zfU9aQdbzo1qrSWlbPQhH1nCgeYgwhOVnj9Bn39shJQitEnXpSQpSNag8+uty5Od6PxmlNKPTnPySRKA==
dependencies:
"@babel/runtime" "^7.23.8"
"@types/prop-types" "^15.7.11"
prop-types "^15.8.1"
react-is "^18.2.0"

"@mui/[email protected]":
version "5.0.20"
resolved "https://registry.yarnpkg.com/@mui/x-date-pickers/-/x-date-pickers-5.0.20.tgz#7b4e5b5a214a8095937ba7d82bb82acd6f270d72"
Expand Down

0 comments on commit f8b6564

Please sign in to comment.