Skip to content
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.

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

feat: add new confirmation modal #406

Merged
merged 18 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
144 changes: 142 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devtron-labs/devtron-fe-common-lib",
"version": "1.1.4",
"version": "1.1.4-beta-1",
"description": "Supporting common component library",
"type": "module",
"main": "dist/index.js",
Expand Down Expand Up @@ -95,6 +95,7 @@
"ansi_up": "^5.2.1",
"dayjs": "^1.11.13",
"fast-json-patch": "^3.1.1",
"framer-motion": "^6.5.1",
"jsonpath-plus": "^10.0.0",
"react-dates": "^21.8.0",
"react-diff-viewer-continued": "^3.4.0",
Expand Down
5 changes: 5 additions & 0 deletions src/Assets/Icon/ic-medium-info.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/Common/Hooks/UseRegisterShortcut/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ export const KEYBOARD_KEYS_MAP = {
Shift: '⇧',
Meta: IS_PLATFORM_MAC_OS ? '⌘' : 'Win',
Alt: IS_PLATFORM_MAC_OS ? '⌥' : 'Alt',
Escape: 'Escape',
F: 'F',
E: 'E',
R: 'R',
K: 'K',
Escape: 'Escape',
Enter: 'Enter',
} as const

export type SupportedKeyboardKeysType = keyof typeof KEYBOARD_KEYS_MAP
Expand Down
46 changes: 46 additions & 0 deletions src/Shared/Components/Backdrop/Backdrop.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import { useEffect } from 'react'
import { createPortal } from 'react-dom'
import { motion } from 'framer-motion'
import { useRegisterShortcut } from '@Common/Hooks'
import { preventBodyScroll, preventOutsideFocus } from '@Shared/Helpers'
import { DEVTRON_BASE_MAIN_ID } from '@Shared/constants'
import { BackdropProps } from './types'
import './backdrop.scss'

const Backdrop = ({ children, onEscape }: BackdropProps) => {
const { registerShortcut, unregisterShortcut } = useRegisterShortcut()

// useEffect on onEscape since onEscape might change based on conditions
useEffect(() => {
registerShortcut({ keys: ['Escape'], callback: onEscape })

return () => {
unregisterShortcut(['Escape'])
}
}, [onEscape])

useEffect(() => {
preventBodyScroll(true)
// Setting main as inert to that focus is trapped inside the new portal
preventOutsideFocus({ identifier: DEVTRON_BASE_MAIN_ID, preventFocus: true })

return () => {
preventBodyScroll(false)
preventOutsideFocus({ identifier: DEVTRON_BASE_MAIN_ID, preventFocus: false })
}
}, [])

return createPortal(
<motion.div
initial={{ opacity: 0 }}
animate={{ opacity: 1 }}
exit={{ opacity: 0, transition: { duration: 0.35 } }}
className="backdrop dc__position-fixed dc__top-0 dc__left-0 full-height-width flexbox dc__content-center dc__align-items-center dc__overflow-hidden"
>
{children}
</motion.div>,
document.getElementById('animated-dialog-backdrop'),
)
}

export default Backdrop
5 changes: 5 additions & 0 deletions src/Shared/Components/Backdrop/backdrop.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.backdrop {
background: rgba(0, 0, 0, 0.75);
z-index: var(--modal-index);
backdrop-filter: blur(1px);
}
1 change: 1 addition & 0 deletions src/Shared/Components/Backdrop/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default as Backdrop } from './Backdrop'
6 changes: 6 additions & 0 deletions src/Shared/Components/Backdrop/types.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { ReactNode } from 'react'

export interface BackdropProps {
children: ReactNode
onEscape: () => void
}
2 changes: 1 addition & 1 deletion src/Shared/Components/CICDHistory/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ const HistorySummaryCard = React.memo(
<span className="dc__bullet dc__bullet--d2 ml-4 mr-4" />
</>
)}
<div className="cn-7 fs-12 dc__ellipsis-right">
<div className="cn-7 fs-12 dc__truncate">
{triggeredBy === 1 ? 'auto trigger' : triggeredByEmail}
</div>
</div>
Expand Down
Loading