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.

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

Fix bugs around mass selection/single selection/drag and drop #11942

Merged
merged 10 commits into from
Dec 30, 2024
Merged

Fix bugs around mass selection/single selection/drag and drop #11942

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6aac8f2
Reimplement selection
MrFlashAccount Dec 25, 2024
bb5507f
Merge branch 'develop' into wip/sergeigarin/fix-selection-in-assets-t…
MrFlashAccount Dec 25, 2024
eafc97d
Fix merge
MrFlashAccount Dec 25, 2024
c22c0bc
Improve visuals
MrFlashAccount Dec 25, 2024
8bb1e4f
Improve selection
MrFlashAccount Dec 26, 2024
ffca111
Fix tests
MrFlashAccount Dec 26, 2024
413d427
Remove bunch of z-index rules
MrFlashAccount Dec 26, 2024
5fbbc8d
Add a few comments
MrFlashAccount Dec 26, 2024
30cbe3d
FIx target directory
MrFlashAccount Dec 27, 2024
dcc0992
Merge branch 'develop' into wip/sergeigarin/fix-selection-in-assets-t…
mergify[bot] Dec 30, 2024
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
1 change: 1 addition & 0 deletions app/common/src/services/Backend.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export const S3ObjectVersionId = newtype.newtypeConstructor<S3ObjectVersionId>()

/** Unique identifier for an arbitrary asset. */
export type AssetId = IdType[keyof IdType]
export const AssetId = newtype.newtypeConstructor<AssetId>()

/** Unique identifier for a payment checkout session. */
export type CheckoutSessionId = newtype.Newtype<string, 'CheckoutSessionId'>
Expand Down
1 change: 1 addition & 0 deletions app/gui/integration-test/dashboard/actions/DrivePageActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ export default class DrivePageActions<Context> extends PageActions<Context> {
dragRowToRow(from: number, to: number) {
return self.step(`Drag drive table row #${from} to row #${to}`, async (page) => {
const rows = locateAssetRows(page)
rows.nth(from).click()
MrFlashAccount marked this conversation as resolved.
Show resolved Hide resolved
await rows.nth(from).dragTo(rows.nth(to), {
sourcePosition: ASSET_ROW_SAFE_POSITION,
targetPosition: ASSET_ROW_SAFE_POSITION,
Expand Down
2 changes: 1 addition & 1 deletion app/gui/src/dashboard/components/AriaComponents/Dialog/Dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { DIALOG_BACKGROUND } from './variants'
const MotionDialog = motion(aria.Dialog)

const OVERLAY_STYLES = tv({
base: 'fixed inset-0 isolate flex items-center justify-center bg-primary/20 z-tooltip',
base: 'fixed inset-0 isolate flex items-center justify-center bg-primary/20',
variants: {
isEntering: { true: 'animate-in fade-in duration-200 ease-out' },
isExiting: { true: 'animate-out fade-out duration-200 ease-in' },
Expand Down
2 changes: 1 addition & 1 deletion app/gui/src/dashboard/components/AriaComponents/Dialog/Popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export interface PopoverProps
}

export const POPOVER_STYLES = twv.tv({
base: 'shadow-xl w-full overflow-clip z-tooltip',
base: 'shadow-xl w-full overflow-clip',
variants: {
isEntering: {
true: 'animate-in fade-in placement-bottom:slide-in-from-top-1 placement-top:slide-in-from-bottom-1 placement-left:slide-in-from-right-1 placement-right:slide-in-from-left-1 ease-out duration-200',
Expand Down
2 changes: 1 addition & 1 deletion app/gui/src/dashboard/components/AriaComponents/Tooltip/Tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import * as text from '../Text'
// =================

export const TOOLTIP_STYLES = twv.tv({
base: 'group flex justify-center items-center text-center text-balance [overflow-wrap:anywhere] z-tooltip',
base: 'group flex justify-center items-center text-center text-balance [overflow-wrap:anywhere]',
variants: {
variant: {
custom: '',
Expand Down
2 changes: 1 addition & 1 deletion app/gui/src/dashboard/components/Badge/Badge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export interface BadgeProps extends VariantProps<typeof BADGE_STYLES> {
}

export const BADGE_STYLES = tv({
base: 'flex items-center justify-center px-[5px] border-[0.5px]',
base: 'flex items-center justify-center px-[5px] border-[0.5px] min-w-6',
variants: {
variant: {
solid: 'border-transparent bg-[var(--badge-bg-color)] text-[var(--badge-text-color)]',
Expand Down
Loading
Loading