Merge branch 'develop' into main

control-ui · Sep 21, 2023 · 4ec9c86 · 4ec9c86
2 parents 6be2850 + 5269cb4
commit 4ec9c86
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 23 deletions.
diff --git a/packages/ctrls-progress/demo/src/index.tsx b/packages/ctrls-progress/demo/src/index.tsx
@@ -1,10 +1,10 @@
 import React from 'react'
-import { render } from 'react-dom'
+import { createRoot } from 'react-dom/client'
 import { App } from './App'
 
-render(
-    <React.Profiler id="Pickers Demo App" onRender={() => null}>
+const root = document.querySelector('#root')
+if(!root) throw new Error('Missing PWA root')
+createRoot(root)
+    .render(<React.Profiler id="Pickers Demo App" onRender={() => null}>
         <App/>
-    </React.Profiler>,
-    document.querySelector('#root'),
-)
+    </React.Profiler>)
diff --git a/packages/ctrls-progress/package-lock.json b/packages/ctrls-progress/package-lock.json
diff --git a/packages/ctrls-progress/package.json b/packages/ctrls-progress/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@ui-controls/progress",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "description": "Material-UI Button + IconButton with progress (loading/error/success)",
     "homepage": "https://bemit.codes",
     "author": "Michael Becker <michael@bemit.codes>",
@@ -39,12 +39,12 @@
         "@emotion/react": "^11.9.0",
         "@emotion/styled": "^11.8.1",
         "react": "^18.0",
-        "react-progress-state": "~0.2.3",
+        "react-progress-state": "~0.3.1",
         "react-dom": "^18.0"
     },
     "peerDependencies": {
         "@mui/material": "^5.1",
-        "react-progress-state": "~0.2.3",
+        "react-progress-state": "~0.2.3 || ~0.3.1",
         "react": "^17.0.2 || ^18.0.0",
         "react-dom": "^17.0.2 || ^18.0.0"
     },

diff --git a/packages/ctrls-progress/src/ButtonProgress/ButtonProgress.tsx b/packages/ctrls-progress/src/ButtonProgress/ButtonProgress.tsx
@@ -8,7 +8,7 @@ import Box from '@mui/material/Box'
 import { buttonColors, ColorMap } from '@ui-controls/progress/buttonColors'
 import { WithConfirmProps } from '@ui-controls/progress/ButtonConfirm'
 import { SxProps } from '@mui/material'
-import { useButtonProgress } from '@ui-controls/progress/useButtonProgress/useButtonProgress'
+import { useButtonProgress } from '@ui-controls/progress/useButtonProgress'
 
 export type ButtonProgressProps = Omit<ButtonProps, 'onClick'> & Partial<WithConfirmProps> & {
     progress: ProgressStateValues

diff --git a/packages/ctrls-progress/src/IconButtonProgress/IconButtonProgress.tsx b/packages/ctrls-progress/src/IconButtonProgress/IconButtonProgress.tsx
@@ -7,7 +7,7 @@ import { useTheme } from '@mui/material/styles'
 import Box from '@mui/material/Box'
 import { SxProps } from '@mui/material'
 import { buttonColors, ColorMap } from '@ui-controls/progress/buttonColors'
-import { useButtonProgress } from '@ui-controls/progress/useButtonProgress/useButtonProgress'
+import { useButtonProgress } from '@ui-controls/progress/useButtonProgress'
 
 export type IconButtonProgressConfirmProps = {
     confirmIcon?: React.ReactNode

diff --git a/packages/ctrls-progress/src/index.ts b/packages/ctrls-progress/src/index.ts
@@ -3,5 +3,7 @@ export * from './ButtonConfirm'
 export * from './ButtonProgress'
 export * from './IconButtonConfirm'
 export * from './IconButtonProgress'
+export * from './ListItemButtonConfirm'
+export * from './useButtonProgress'
 export * from './useWithConfirm'
 export * from './useWithProgress'
diff --git a/packages/ctrls-progress/src/useButtonProgress/index.ts b/packages/ctrls-progress/src/useButtonProgress/index.ts
@@ -0,0 +1 @@
+export * from './useButtonProgress'