Try to fix SpeedDial.ariaLabel mismatch with AriaAttributes

karakum-team · Dec 25, 2024 · bf47334 · bf47334
1 parent e649ad1
commit bf47334
Show file tree

Hide file tree

Showing 22 changed files with 46 additions and 78 deletions.
diff --git a/buildSrc/src/main/kotlin/karakum/mui/Overrides.kt b/buildSrc/src/main/kotlin/karakum/mui/Overrides.kt
@@ -100,7 +100,7 @@ internal fun fixOverrides(
 
         "SpeedDial",
             -> content
-            .override("ariaLabel").replace("override var ariaLabel: String", "override var ariaLabel: String?")
+            .override("ariaLabel").replace("override var ariaLabel: String", "/* override var ariaLabel: String */")
             .override("hidden")
 
         "Tab",

diff --git a/mui-kotlin/src/jsMain/kotlin/mui/base/TablePagination.types.kt b/mui-kotlin/src/jsMain/kotlin/mui/base/TablePagination.types.kt
@@ -2,8 +2,6 @@
 
 package mui.base
 
-import web.html.HTMLElement
-
 external interface TablePaginationProps :
     TablePaginationOwnProps,
     react.dom.html.HTMLAttributes<web.html.HTMLTableCellElement>
@@ -105,7 +103,7 @@ external interface TablePaginationOwnProps : react.Props {
      *
      * @param {React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>} event The event source of the callback.
      */
-    var onRowsPerPageChange: react.dom.events.ChangeEventHandler<HTMLElement>?
+    var onRowsPerPageChange: react.dom.events.ChangeEventHandler<web.html.HTMLElement>?
 
     /**
      * The zero-based index of the current page.

diff --git a/mui-kotlin/src/jsMain/kotlin/mui/base/useButton.types.kt b/mui-kotlin/src/jsMain/kotlin/mui/base/useButton.types.kt
@@ -2,7 +2,6 @@
 
 package mui.base
 
-import web.dom.Element
 import web.html.ButtonType
 
 external interface UseButtonParameters {
@@ -22,7 +21,7 @@ external interface UseButtonParameters {
 
     var onFocusVisible: react.dom.events.FocusEventHandler<*>?
 
-    var rootRef: react.Ref<Element>?
+    var rootRef: react.Ref<web.dom.Element>?
 
     var tabIndex: Int?
 
@@ -91,5 +90,5 @@ external interface UseButtonReturnValue {
     /**
      * A ref to the component's root DOM element.
      */
-    var rootRef: react.RefCallback<Element>?
+    var rootRef: react.RefCallback<web.dom.Element>?
 }
diff --git a/mui-kotlin/src/jsMain/kotlin/mui/base/useInput.types.kt b/mui-kotlin/src/jsMain/kotlin/mui/base/useInput.types.kt
@@ -2,8 +2,6 @@
 
 package mui.base
 
-import web.html.HTMLElement
-
 external interface UseInputParameters {
     /**
      * The default value. Use when the component is not controlled.
@@ -22,13 +20,13 @@ external interface UseInputParameters {
      */
     var error: Boolean?
 
-    var onBlur: react.dom.events.FocusEventHandler<HTMLElement>?
+    var onBlur: react.dom.events.FocusEventHandler<web.html.HTMLElement>?
 
     var onClick: react.dom.events.MouseEventHandler<*>?
 
-    var onChange: react.dom.events.ChangeEventHandler<HTMLElement>?
+    var onChange: react.dom.events.ChangeEventHandler<web.html.HTMLElement>?
 
-    var onFocus: react.dom.events.FocusEventHandler<HTMLElement>?
+    var onFocus: react.dom.events.FocusEventHandler<web.html.HTMLElement>?
 
     var inputRef: react.Ref<web.html.HTMLInputElement /* or web.html.HTMLTextAreaElement*/>?
 
@@ -52,11 +50,11 @@ external interface UseInputInputSlotOwnProps : react.Props {
 
     var value: dynamic
 
-    var onBlur: react.dom.events.FocusEventHandler<HTMLElement>
+    var onBlur: react.dom.events.FocusEventHandler<web.html.HTMLElement>
 
-    var onChange: react.dom.events.ChangeEventHandler<HTMLElement>
+    var onChange: react.dom.events.ChangeEventHandler<web.html.HTMLElement>
 
-    var onFocus: react.dom.events.FocusEventHandler<HTMLElement>
+    var onFocus: react.dom.events.FocusEventHandler<web.html.HTMLElement>
 
     var required: Boolean
 

diff --git a/mui-kotlin/src/jsMain/kotlin/mui/base/useList.types.kt b/mui-kotlin/src/jsMain/kotlin/mui/base/useList.types.kt
@@ -3,7 +3,6 @@
 package mui.base
 
 import js.array.ReadonlyArray
-import web.dom.Element
 import web.html.HTMLElement
 
 external interface ListState<ItemValue> {
@@ -80,7 +79,7 @@ external interface UseListParameters<ItemValue, State, CustomAction, CustomActio
     /**
      * Ref to the list root DOM element.
      */
-    var rootRef: react.Ref<Element>?
+    var rootRef: react.Ref<web.dom.Element>?
 
     /**
      * Callback fired when the selected value changes.
@@ -193,7 +192,7 @@ external interface UseListReturnValue {
      */
     var getRootProps: react.Props /* <ExternalProps extends Record<string, unknown> = {}>(externalProps?: ExternalProps) => UseListRootSlotProps<ExternalProps> */
 
-    var rootRef: react.RefCallback<Element>?
+    var rootRef: react.RefCallback<web.dom.Element>?
 
     var state: dynamic
 }
diff --git a/mui-kotlin/src/jsMain/kotlin/mui/base/useMenu.types.kt b/mui-kotlin/src/jsMain/kotlin/mui/base/useMenu.types.kt
@@ -3,8 +3,6 @@
 package mui.base
 
 import js.array.ReadonlyArray
-import web.dom.Element
-import web.html.HTMLElement
 
 external interface UseMenuParameters {
     /**
@@ -40,7 +38,7 @@ external interface UseMenuParameters {
     /**
      * The ref to the menu's listbox node.
      */
-    var listboxRef: react.Ref<Element>?
+    var listboxRef: react.Ref<web.dom.Element>?
 
     /**
      * The name of the component using useMenu.
@@ -77,7 +75,7 @@ external interface UseMenuReturnValue {
     /**
      * The ref to the menu's listbox node.
      */
-    var listboxRef: react.RefCallback<Element>?
+    var listboxRef: react.RefCallback<web.dom.Element>?
 
     /**
      * Items in the menu listbox.
@@ -92,5 +90,5 @@ external interface UseMenuReturnValue {
     /**
      * An element that triggers the visibility of the menu.
      */
-    var triggerElement: HTMLElement?
+    var triggerElement: web.html.HTMLElement?
 }
diff --git a/mui-kotlin/src/jsMain/kotlin/mui/base/useMenuButton.types.kt b/mui-kotlin/src/jsMain/kotlin/mui/base/useMenuButton.types.kt
@@ -2,9 +2,6 @@
 
 package mui.base
 
-import web.dom.Element
-import web.html.HTMLElement
-
 external interface UseMenuButtonParameters {
     /**
      * If `true`, the component is disabled.
@@ -21,7 +18,7 @@ external interface UseMenuButtonParameters {
     /**
      * The ref to the root element.
      */
-    var rootRef: react.Ref<HTMLElement>?
+    var rootRef: react.Ref<web.html.HTMLElement>?
 }
 
 external interface UseMenuButtonReturnValue {
@@ -42,5 +39,5 @@ external interface UseMenuButtonReturnValue {
     /**
      * The ref to the root element.
      */
-    var rootRef: react.RefCallback<Element>?
+    var rootRef: react.RefCallback<web.dom.Element>?
 }
diff --git a/mui-kotlin/src/jsMain/kotlin/mui/base/useMenuItem.types.kt b/mui-kotlin/src/jsMain/kotlin/mui/base/useMenuItem.types.kt
@@ -2,8 +2,6 @@
 
 package mui.base
 
-import web.dom.Element
-
 external interface MenuItemMetadata {
     var id: String
 
@@ -21,7 +19,7 @@ external interface UseMenuItemParameters {
 
     var onClick: react.dom.events.MouseEventHandler<*>?
 
-    var rootRef: react.Ref<Element>
+    var rootRef: react.Ref<web.dom.Element>
 
     /**
      * If `true`, the menu item won't receive focus when the mouse moves over it.
@@ -62,7 +60,7 @@ external interface UseMenuItemReturnValue {
     /**
      * The ref to the component's root DOM element.
      */
-    var rootRef: react.RefCallback<Element>?
+    var rootRef: react.RefCallback<web.dom.Element>?
 
     /**
      * Total number of items in the menu.

diff --git a/mui-kotlin/src/jsMain/kotlin/mui/base/useOption.types.kt b/mui-kotlin/src/jsMain/kotlin/mui/base/useOption.types.kt
@@ -2,8 +2,6 @@
 
 package mui.base
 
-import web.dom.Element
-
 external interface SelectOption<Value> {
     var value: Value
 
@@ -21,7 +19,7 @@ external interface UseOptionParameters<Value> {
 
     var label: react.ReactNode
 
-    var rootRef: react.Ref<Element>?
+    var rootRef: react.Ref<web.dom.Element>?
 
     var value: Value
 }
@@ -49,5 +47,5 @@ external interface UseOptionReturnValue {
     /**
      * Ref to the root slot DOM node.
      */
-    var rootRef: react.RefCallback<Element>?
+    var rootRef: react.RefCallback<web.dom.Element>?
 }
diff --git a/mui-kotlin/src/jsMain/kotlin/mui/base/useSelect.types.kt b/mui-kotlin/src/jsMain/kotlin/mui/base/useSelect.types.kt
@@ -2,8 +2,6 @@
 
 package mui.base
 
-import web.dom.Element
-
 external interface SelectOptionDefinition<Value> {
     var value: Value
 
@@ -42,7 +40,7 @@ external interface UseSelectParameters<OptionValue, Multiple> {
     /**
      * The ref of the trigger button element.
      */
-    var buttonRef: react.Ref<Element>?
+    var buttonRef: react.Ref<web.dom.Element>?
 
     /**
      * The `id` attribute of the listbox element.
@@ -52,7 +50,7 @@ external interface UseSelectParameters<OptionValue, Multiple> {
     /**
      * The ref of the listbox element.
      */
-    var listboxRef: react.Ref<Element>?
+    var listboxRef: react.Ref<web.dom.Element>?
 
     /**
      * If `true`, the end user can select multiple values.
@@ -145,7 +143,7 @@ external interface UseSelectReturnValue<Value, Multiple> {
     /**
      * Ref to the button slot DOM node.
      */
-    var buttonRef: react.RefCallback<Element>?
+    var buttonRef: react.RefCallback<web.dom.Element>?
 
     /**
      * If `true`, the select is disabled.
@@ -200,7 +198,7 @@ external interface UseSelectReturnValue<Value, Multiple> {
     /**
      * Ref to the listbox slot DOM node.
      */
-    var listboxRef: react.RefCallback<Element>?
+    var listboxRef: react.RefCallback<web.dom.Element>?
 
     /**
      * If `true`, the listbox is open.

diff --git a/mui-kotlin/src/jsMain/kotlin/mui/base/useSlider.types.kt b/mui-kotlin/src/jsMain/kotlin/mui/base/useSlider.types.kt
@@ -3,7 +3,6 @@
 package mui.base
 
 import js.array.ReadonlyArray
-import web.dom.Element
 import web.events.Event
 
 external interface UseSliderParameters {
@@ -90,7 +89,7 @@ external interface UseSliderParameters {
     /**
      * The ref attached to the root of the Slider.
      */
-    var rootRef: react.Ref<Element>?
+    var rootRef: react.Ref<web.dom.Element>?
 
     /**
      * A transformation function, to change the scale of the slider.
@@ -208,7 +207,7 @@ external interface UseSliderReturnValue {
     /**
      * Ref to the root slot's DOM node.
      */
-    var rootRef: react.RefCallback<Element>?
+    var rootRef: react.RefCallback<web.dom.Element>?
 
     /**
      * The track leap for the current value of the slider.

diff --git a/mui-kotlin/src/jsMain/kotlin/mui/base/useTab.types.kt b/mui-kotlin/src/jsMain/kotlin/mui/base/useTab.types.kt
@@ -2,8 +2,6 @@
 
 package mui.base
 
-import web.dom.Element
-
 external interface UseTabParameters {
     /**
      * The value of the tab.
@@ -36,7 +34,7 @@ external interface UseTabParameters {
     /**
      * Ref to the root slot's DOM element.
      */
-    var rootRef: react.Ref<Element>?
+    var rootRef: react.Ref<web.dom.Element>?
 }
 
 external interface UseTabReturnValue {
@@ -71,7 +69,7 @@ external interface UseTabReturnValue {
     /**
      * Ref to the root slot's DOM element.
      */
-    var rootRef: react.RefCallback<Element>?
+    var rootRef: react.RefCallback<web.dom.Element>?
 
     /**
      * If `true`, the tab is selected.

diff --git a/mui-kotlin/src/jsMain/kotlin/mui/base/useTabPanel.types.kt b/mui-kotlin/src/jsMain/kotlin/mui/base/useTabPanel.types.kt
@@ -2,8 +2,6 @@
 
 package mui.base
 
-import web.html.HTMLElement
-
 external interface UseTabPanelParameters {
     /**
      * The id of the TabPanel.
@@ -13,7 +11,7 @@ external interface UseTabPanelParameters {
     /**
      * The ref of the TabPanel.
      */
-    var rootRef: react.Ref<HTMLElement>?
+    var rootRef: react.Ref<web.html.HTMLElement>?
 
     /**
      * The value of the TabPanel. It will be shown when the Tab with the corresponding value is selected.
@@ -34,5 +32,5 @@ external interface UseTabPanelReturnValue {
      */
     var getRootProps: react.Props /* <ExternalProps extends Record<string, unknown> = {}>(externalProps?: ExternalProps) => UseTabPanelRootSlotProps<ExternalProps> */
 
-    var rootRef: react.Ref<HTMLElement>
+    var rootRef: react.Ref<web.html.HTMLElement>
 }
diff --git a/mui-kotlin/src/jsMain/kotlin/mui/base/useTabsList.types.kt b/mui-kotlin/src/jsMain/kotlin/mui/base/useTabsList.types.kt
@@ -2,13 +2,11 @@
 
 package mui.base
 
-import web.dom.Element
-
 external interface UseTabsListParameters {
     /**
      * Ref to the root element.
      */
-    var rootRef: react.Ref<Element>
+    var rootRef: react.Ref<web.dom.Element>
 }
 
 external interface UseTabsListReturnValue {
@@ -45,7 +43,7 @@ external interface UseTabsListReturnValue {
      */
     var orientation: Orientation
 
-    var rootRef: react.RefCallback<Element>?
+    var rootRef: react.RefCallback<web.dom.Element>?
 
     /**
      * The value of the currently selected tab.

diff --git a/mui-kotlin/src/jsMain/kotlin/mui/material/Pagination.kt b/mui-kotlin/src/jsMain/kotlin/mui/material/Pagination.kt
@@ -6,12 +6,11 @@ package mui.material
 
 import mui.material.styles.Theme
 import mui.system.SxProps
-import web.html.HTMLElement
 
 external interface PaginationProps :
     UsePaginationProps,
     mui.system.StandardProps,
-    react.dom.html.HTMLAttributes<HTMLElement>,
+    react.dom.html.HTMLAttributes<web.html.HTMLElement>,
     mui.system.PropsWithSx {
     /**
      * Override or extend the styles applied to the component.

diff --git a/mui-kotlin/src/jsMain/kotlin/mui/material/SpeedDial.kt b/mui-kotlin/src/jsMain/kotlin/mui/material/SpeedDial.kt
@@ -26,7 +26,7 @@ external interface SpeedDialProps :
      * The aria-label of the button element.
      * Also used to provide the `id` for the `SpeedDial` element and its children.
      */
-    override var ariaLabel: String?
+    /* override var ariaLabel: String */
 
     /**
      * The direction the actions open relative to the floating action button.