Skip to content

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@YeonV
YeonV committed Nov 28, 2024
1 parent a1e2444 commit 6298078
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 164 deletions.
90 changes: 45 additions & 45 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,34 @@
"node": ">=20"
},
"dependencies": {
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/core": "^6.2.0",
"@dnd-kit/modifiers": "^7.0.0",
"@electron/remote": "^2.0.9",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.9.1",
"@emotion/react": "^11.13.5",
"@emotion/styled": "^11.13.5",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.15.0",
"@fontsource/roboto": "^5.0.14",
"@hello-pangea/dnd": "^17.0.0",
"@mui/icons-material": "^6.1.4",
"@mui/lab": "^6.0.0-beta.12",
"@mui/material": "^6.1.4",
"@mui/styles": "^6.1.4",
"@mui/x-data-grid": "^7.21.0",
"@storybook/manager-api": "^8.3.6",
"@storybook/preview-api": "^8.3.6",
"@storybook/react": "^8.3.6",
"@storybook/theming": "^8.3.6",
"@mui/icons-material": "^6.1.9",
"@mui/lab": "^6.0.0-beta.17",
"@mui/material": "^6.1.9",
"@mui/styles": "^6.1.9",
"@mui/x-data-grid": "^7.22.3",
"@storybook/manager-api": "^8.4.5",
"@storybook/preview-api": "^8.4.5",
"@storybook/react": "^8.4.5",
"@storybook/theming": "^8.4.5",
"@testing-library/react": "^16.0.1",
"@types/qs": "^6.9.11",
"@types/qs": "^6.9.17",
"@types/reactour": "^1.18.5",
"@typescript-eslint/eslint-plugin": "^8.10.0",
"@typescript-eslint/parser": "^8.10.0",
"@webcam/react": "^1.0.1",
"axios": "^1.7.7",
"axios": "^1.7.8",
"base32-decode": "^1.0.0",
"base32-encode": "1.2.0",
"chart.js": "4.4.5",
"chart.js": "4.4.6",
"color": "^4.2.3",
"compare-versions": "^6.1.1",
"conf": "^13.0.1",
Expand All @@ -55,10 +55,10 @@
"jwt-decode": "^4.0.0",
"notistack": "^3.0.1",
"oauth-pkce": "0.0.7",
"postcss": "^8.4.47",
"postcss": "^8.4.49",
"prop-types": "^15.8.1",
"qrcode": "^1.5.4",
"qs": "^6.13.0",
"qs": "^6.13.1",
"react": "^18.2.0",
"react-beautiful-dnd": "^13.1.1",
"react-chartjs-2": "5.2.0",
Expand All @@ -80,20 +80,20 @@
"sockette": "^2.0.6",
"strip-ansi": "7.1.0",
"styled-components": "^6.1.13",
"ts-deepmerge": "^7.0.1",
"typescript": "^5.5.4",
"universal-cookie": "^7.2.0",
"ts-deepmerge": "^7.0.2",
"typescript": "^5.7.2",
"universal-cookie": "^7.2.2",
"use-api-polling": "^0.1.4",
"use-debounce": "^10.0.4",
"use-indexeddb": "^2.0.2",
"use-long-press": "^3.2.0",
"web-vitals": "^4.2.3",
"webmidi": "^3.1.11",
"workbox-core": "^7.0.0",
"workbox-expiration": "^7.0.0",
"workbox-precaching": "^7.0.0",
"workbox-routing": "^7.0.0",
"workbox-strategies": "^7.0.0",
"web-vitals": "^4.2.4",
"webmidi": "^3.1.12",
"workbox-core": "^7.3.0",
"workbox-expiration": "^7.3.0",
"workbox-precaching": "^7.3.0",
"workbox-routing": "^7.3.0",
"workbox-strategies": "^7.3.0",
"zustand": "^4.5.5"
},
"scripts": {
Expand Down Expand Up @@ -181,20 +181,20 @@
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@chromatic-com/storybook": "1",
"@eslint/compat": "^1.2.1",
"@storybook/addon-actions": "^8.3.6",
"@storybook/addon-essentials": "^8.3.6",
"@storybook/addon-links": "^8.3.6",
"@storybook/addon-mdx-gfm": "^8.3.6",
"@storybook/node-logger": "^8.3.6",
"@storybook/preset-create-react-app": "^8.3.6",
"@storybook/react-webpack5": "^8.3.6",
"@eslint/compat": "^1.2.3",
"@storybook/addon-actions": "^8.4.5",
"@storybook/addon-essentials": "^8.4.5",
"@storybook/addon-links": "^8.4.5",
"@storybook/addon-mdx-gfm": "^8.4.5",
"@storybook/node-logger": "^8.4.5",
"@storybook/preset-create-react-app": "^8.4.5",
"@storybook/react-webpack5": "^8.4.5",
"@types/babel__template": "^7.4.4",
"@types/chart.js": "^2.9.41",
"@types/color": "^3.0.6",
"@types/color": "^4.2.0",
"@types/eslint__js": "^8.42.3",
"@types/prop-types": "^15.7.11",
"@types/react": "^18.3.5",
"@types/react": "^18.3.12",
"@types/react-beautiful-dnd": "^13.1.8",
"@types/react-dom": "^18.2.19",
"@types/react-router-dom": "^5.3.3",
Expand All @@ -209,17 +209,17 @@
"eslint-plugin-flowtype": "^8.0.3",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-json": "^4.0.1",
"eslint-plugin-jsx-a11y": "6.10.0",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-n": "^17.10.2",
"eslint-plugin-promise": "^7.1.0",
"eslint-plugin-react": "^7.35.0",
"eslint-plugin-react": "^7.37.2",
"gh-pages": "^6.1.1",
"prettier": "^3.3.3",
"prettier": "^3.4.1",
"react-is": "^18.2.0",
"run-script-os": "^1.1.6",
"storybook": "^8.3.6",
"storybook": "^8.4.5",
"wait-on": "^8.0.0",
"webpack": "^5.94.0"
"webpack": "^5.96.1"
},
"resolutions": {
"string-width": "4.2.3"
Expand Down Expand Up @@ -285,4 +285,4 @@
]
}
}
}
}
23 changes: 12 additions & 11 deletions src/components/Dialogs/SmartBar.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,23 +234,24 @@ const Bar = ({ handleClose, direct, maxWidth = 500, inputRef }: any) => {
renderInput={(params) => (
<TextField
{...params}
InputProps={{
...params.InputProps,
startAdornment: (
<InputAdornment position="start" sx={{ ml: 1 }}>
<LocalPlay />
</InputAdornment>
)
}}
inputRef={inputRef}
autoFocus={!direct}
color="primary"
style={{ borderRadius: '50%' }}
label="SmartBar"
placeholder="Jump to device / Activate scene"
inputProps={{
...params.inputProps,
autoComplete: 'off' // disable autocomplete and autofill
slotProps={{
input: {
...params.InputProps,
startAdornment: (
<InputAdornment position="start" sx={{ ml: 1 }}>
<LocalPlay />
</InputAdornment>
)
},
htmlInput: {
autoComplete: 'off' // disable autocomplete and autofill
}
}}
/>
)}
Expand Down
4 changes: 2 additions & 2 deletions src/components/Popover/Popover.interface.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ export interface PopoverProps {
/**
* JSX style for the Button
*/
sxButton?: any
sxButton?: SxProps<Theme>
/**
* JSX style for the Fab
*/
sx?: any
sx?: SxProps<Theme>
/**
* JSX style
*/
Expand Down
2 changes: 1 addition & 1 deletion src/components/Popover/Popover.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ const Popover = ({
{content || (
<Typography sx={{ padding: theme.spacing(2) }}>{text}</Typography>
)}
<Button
<Button
disabled={confirmDisabled}
aria-describedby={id}
variant="contained"
Expand Down
104 changes: 0 additions & 104 deletions src/components/SchemaForm/components/DropDown/DropDown.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
// import {
// Autocomplete,
// Checkbox,
// ListItemText,
// MenuItem,
// Select,
// TextField,
// ToggleButton,
// ToggleButtonGroup
// } from '@mui/material'
// import { useMemo, useState } from 'react'
import { EffectDropDownProps } from './DropDown.props'
// import useStyles from './DropDown.styles'
import EffectTypeDialog from '../../../Dialogs/EffectTypeDialog'

const EffectDropDown = ({
Expand Down Expand Up @@ -40,101 +28,9 @@ const EffectDropDown = ({
},
showFilter = false
}: EffectDropDownProps) => {
// const classes = useStyles()
// const [formats, setFormats] = useState(
// () => groups && Object.keys(groups).map((c) => c || [])
// )
// const handleFormat = (_: any, newFormats: any) => {
// setFormats(newFormats)
// }
// const handleFormatb = (e: any) => {
// setFormats(e.target.value)
// }
// const yopt = useMemo(
// () => [
// ...Object.keys(groups || {})
// .flatMap(
// (c) =>
// formats &&
// formats.indexOf(c) !== -1 &&
// groups[c].flatMap((e: any) => [
// { value: e.id, label: e.name, group: c }
// ])
// )
// .filter((e: any) => !!e?.value)
// ],
// [groups, formats]
// )

return (
<>
{/* <Autocomplete
fullWidth
blurOnSelect
value={value}
onChange={(e: any, b: any) => {
const ne = { ...e, target: { ...e.target, value: b.value } }
if (onChange) return onChange(ne)
return null
}}
sx={{ pb: '0px', pt: '5px !important', width: '100%' }}
groupBy={(option) => option.group}
options={yopt}
isOptionEqualToValue={(option, nvalue) => option.value === nvalue}
disableClearable
getOptionLabel={(option) => {
if (typeof option !== 'string') return option.label
return yopt.find((o) => o.value === option)?.label || ''
}}
renderInput={(params) => (
<TextField
{...params}
value={yopt.find((o) => o.value === value)?.label || ''}
label={title}
variant="outlined"
fullWidth
/>
)}
/>
{showFilter && (
<ToggleButtonGroup
value={formats}
onChange={handleFormat}
aria-label="text formatting"
className={classes.FormToggleWrapper}
>
{groups &&
Object.keys(groups).map((c, i) => (
<ToggleButton
className={classes.FormToggle}
key={i}
value={c}
aria-label={c}
>
{c}
</ToggleButton>
))}
</ToggleButtonGroup>
)}
{showFilter && (
<Select
fullWidth
value={formats}
onChange={handleFormatb}
multiple
sx={{ pb: '5px', pt: '0 !important', width: '100%' }}
variant="outlined"
renderValue={(selected) => selected.join(', ')}
>
{groups &&
Object.keys(groups).map((c, i) => (
<MenuItem key={i} value={c}>
<Checkbox checked={formats.indexOf(c) > -1} />
<ListItemText primary={c} />
</MenuItem>
))}
</Select>
)} */}
<EffectTypeDialog
title={title}
value={value}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Device/PresetsComplex.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const PresetsComplex = ({virtId}: {virtId: string}) => {
<TextField
autoFocus
onKeyDown={(e: any) => {
console.log(name)
// console.log(name)
if (e.key === 'Enter' && !(name.length === 0 || (scenes && (Object.keys(scenes).indexOf(`${virtId}-${name}`) > -1 || Object.values(scenes).filter((p: any) => p.name === `${virtId}-${name}`).length > 0)) || !valid)) {
handleAddScene()
setOpen(!open)
Expand Down

0 comments on commit 6298078

Please sign in to comment.