Skip to content

fix(dependencies): remove velocity React (SOFIE-3716) #1400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jstarpl merged 5 commits into from
Mar 27, 2025
Merged

fix(dependencies): remove velocity React (SOFIE-3716) #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f071414
fix: remove deprecated `velocity-react` and `velocity-animate`
jstarpl Mar 6, 2025
e13433e
fix: remove `velocity-animate` uses
jstarpl Mar 7, 2025
70a6059
fix(Dialog): resolve issue with dialog sizing
jstarpl Mar 7, 2025
15ba776
fix(OverlayScreenSaver): resolve issue with animation
jstarpl Mar 7, 2025
8c5dd70
fix: Bring back onExit callback check
jstarpl Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/webui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"immutability-helper": "^3.1.1",
"lottie-web": "^5.12.2",
"moment": "^2.30.1",
"motion": "^12.4.7",
"promise.allsettled": "^1.0.7",
"query-string": "^6.14.1",
"rc-tooltip": "^6.4.0",
Expand All @@ -80,8 +81,6 @@
"shuttle-webhid": "^0.0.2",
"type-fest": "^4.33.0",
"underscore": "^1.13.7",
"velocity-animate": "^1.5.2",
"velocity-react": "^1.4.3",
"webmidi": "^2.5.3",
"xmlbuilder": "^15.1.1"
},
Expand Down
1 change: 0 additions & 1 deletion packages/webui/public/origo-ui/dist/origo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4007,7 +4007,6 @@ input[type=search].pi-input {
margin-left: -10px; }

.title-box-content {
height: 100%;
max-height: 28em;
overflow-y: auto;
overflow-x: hidden; }
Expand Down
227 changes: 107 additions & 120 deletions packages/webui/src/client/lib/ModalDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import FocusBounder from 'react-focus-bounder'
import { useTranslation } from 'react-i18next'

import ClassNames from 'classnames'
// @ts-expect-error No types available
import * as VelocityReact from 'velocity-react'
import { motion } from 'motion/react'
import { logger } from './logging'
import * as _ from 'underscore'
import { withTranslation } from 'react-i18next'
Expand Down Expand Up @@ -141,135 +140,123 @@ export function ModalDialog({

return (
<Escape to="viewport">
<VelocityReact.VelocityTransitionGroup
enter={{ animation: 'fadeIn', easing: 'ease-out', duration: 250 }}
runOnMount={true}
<motion.div
className="glass-pane"
initial={{ opacity: 0 }}
animate={{ opacity: 1 }}
transition={{ ease: 'easeOut', duration: 0.25 }}
>
<div className="glass-pane">
<FocusBounder>
<div className="glass-pane-content">
<VelocityReact.VelocityTransitionGroup
enter={{
animation: {
translateY: [0, 100],
opacity: [1, 0],
<FocusBounder>
<div className="glass-pane-content">
<motion.dialog
open={true}
className={'border-box overlay-m ' + (className || '')}
role="alertdialog"
onKeyUp={onDialogKeyUp}
onKeyDown={onDialogKeyDown}
initial={{ translateY: 100, opacity: 0 }}
animate={{ translateY: 0, opacity: 1 }}
transition={{ type: 'spring', bounce: 0.25, duration: 0.25 }}
>
<div className={'flex-row ' + (warning ? 'warn' : 'info') + ' vertical-align-stretch tight-s'}>
<div className="flex-col c12">
<h2>{title}</h2>
</div>
<div className="flex-col horizontal-align-right vertical-align-middle">
<p>
<button
className="action-btn"
onClick={handleDiscard}
onKeyDown={preventClickOnEnter}
onKeyUp={emulateClick}
aria-label={t('Dismiss')}
>
<CoreIcons.NrkClose />
</button>
</p>
</div>
</div>
<div className="title-box-content">{children}</div>
{inputs ? (
<div className="title-box-inputs">
{_.map(inputs, (input: ModalInput, attribute: string) => {
return (
<div className="title-box-input" key={attribute}>
{input.text}
<EditAttribute
type={input.type}
label={input.label}
options={input.options}
overrideDisplayValue={input.defaultValue}
attribute={attribute}
updateFunction={updateInput}
/>
</div>
)
})}
</div>
) : null}
<div
className={ClassNames(
'mod',
{
alright: !secondaryText,
},
easing: 'spring',
duration: 250,
}}
runOnMount={true}
'modal-dialog-actions'
)}
>
<dialog
open={true}
className={'border-box overlay-m ' + className || ''}
role="alertdialog"
onKeyUp={onDialogKeyUp}
onKeyDown={onDialogKeyDown}
>
<div className={'flex-row ' + (warning ? 'warn' : 'info') + ' vertical-align-stretch tight-s'}>
<div className="flex-col c12">
<h2>{title}</h2>
</div>
<div className="flex-col horizontal-align-right vertical-align-middle">
<p>
<button
className="action-btn"
onClick={handleDiscard}
onKeyDown={preventClickOnEnter}
onKeyUp={emulateClick}
aria-label={t('Dismiss')}
>
<CoreIcons.NrkClose />
</button>
</p>
</div>
</div>
<div className="title-box-content">{children}</div>
{inputs ? (
<div className="title-box-inputs">
{_.map(inputs, (input: ModalInput, attribute: string) => {
return (
<div className="title-box-input" key={attribute}>
{input.text}
<EditAttribute
type={input.type}
label={input.label}
options={input.options}
overrideDisplayValue={input.defaultValue}
attribute={attribute}
updateFunction={updateInput}
/>
</div>
)
})}
</div>
) : null}
<div
className={ClassNames(
'mod',
{
alright: !secondaryText,
},
'modal-dialog-actions'
)}
{secondaryText && (
<button
className={ClassNames('btn', discardAsPrimary ? 'btn-primary' : 'btn-secondary', 'discard-btn', {
'btn-warn': discardAsPrimary && warning,
})}
autoFocus={discardAsPrimary}
onClick={handleSecondary}
onKeyDown={preventClickOnEnter}
onKeyUp={emulateClick}
>
{secondaryText && (
{secondaryText}
</button>
)}
{_.compact(
_.map(actions || [], (action: ModalAction, i) => {
if (!action) return null
return (
<button
key={i}
className={ClassNames(
'btn',
discardAsPrimary ? 'btn-primary' : 'btn-secondary',
'discard-btn',
{ 'btn-warn': discardAsPrimary && warning }
'btn right mrs',
{
'btn-secondary': !(action.classNames || '').match(/btn-/),
},
action.classNames
)}
autoFocus={discardAsPrimary}
onClick={handleSecondary}
onClick={(e) => handleAction(e, action.on)}
onKeyDown={preventClickOnEnter}
onKeyUp={emulateClick}
>
{secondaryText}
{action.label}
</button>
)}
{_.compact(
_.map(actions || [], (action: ModalAction, i) => {
if (!action) return null
return (
<button
key={i}
className={ClassNames(
'btn right mrs',
{
'btn-secondary': !(action.classNames || '').match(/btn-/),
},
action.classNames
)}
onClick={(e) => handleAction(e, action.on)}
onKeyDown={preventClickOnEnter}
onKeyUp={emulateClick}
>
{action.label}
</button>
)
})
)}
<button
className={ClassNames('btn', !discardAsPrimary ? 'btn-primary' : 'btn-secondary', {
right: secondaryText !== undefined,
'btn-warn': !discardAsPrimary && warning,
})}
autoFocus={!discardAsPrimary}
onClick={handleAccept}
onKeyDown={preventClickOnEnter}
onKeyUp={emulateClick}
>
{acceptText}
</button>
</div>
</dialog>
</VelocityReact.VelocityTransitionGroup>
</div>
</FocusBounder>
</div>
</VelocityReact.VelocityTransitionGroup>
)
})
)}
<button
className={ClassNames('btn', !discardAsPrimary ? 'btn-primary' : 'btn-secondary', {
right: secondaryText !== undefined,
'btn-warn': !discardAsPrimary && warning,
})}
autoFocus={!discardAsPrimary}
onClick={handleAccept}
onKeyDown={preventClickOnEnter}
onKeyUp={emulateClick}
>
{acceptText}
</button>
</div>
</motion.dialog>
</div>
</FocusBounder>
</motion.div>
</Escape>
)
}
Expand Down
Loading
Loading