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

Setting hugging parent to fixed is optional when converting to absolute #4354

Merged
merged 11 commits into from
Oct 12, 2023
Merged

Setting hugging parent to fixed is optional when converting to absolute #4354

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ef1cac2
Two kinds of convert to absolute and move strategies
gbalint Oct 11, 2023
156db81
Fix test
gbalint Oct 11, 2023
eb8d076
Generalize runEscapeHatch and add tests
gbalint Oct 11, 2023
a3d88b8
Fix tests
gbalint Oct 11, 2023
5c7a14f
Use sizeToVisualDimensions instead of reinventing the wheel
gbalint Oct 11, 2023
a3c3015
Merge branch 'master' into feature/two-convert-to-absolute-strategies
gbalint Oct 11, 2023
5fd1933
Fix tests
gbalint Oct 11, 2023
981b90e
Do not allow hugging strategy when parent is not hugging
gbalint Oct 12, 2023
ef07dc9
Add comment
gbalint Oct 12, 2023
b67f999
Fix test
gbalint Oct 12, 2023
3f0dedb
Fix tests
gbalint Oct 12, 2023
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
6 changes: 5 additions & 1 deletion editor/src/components/canvas/canvas-strategies/canvas-strategies.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ import { isNotYetStartedDragInteraction } from './interaction-state'
import { keyboardAbsoluteMoveStrategy } from './strategies/keyboard-absolute-move-strategy'
import { absoluteResizeBoundingBoxStrategy } from './strategies/absolute-resize-bounding-box-strategy'
import { keyboardAbsoluteResizeStrategy } from './strategies/keyboard-absolute-resize-strategy'
import { convertToAbsoluteAndMoveStrategy } from './strategies/convert-to-absolute-and-move-strategy'
import {
convertToAbsoluteAndMoveAndSetParentFixedStrategy,
convertToAbsoluteAndMoveStrategy,
} from './strategies/convert-to-absolute-and-move-strategy'
import { absoluteDuplicateStrategy } from './strategies/absolute-duplicate-strategy'
import type { BuiltInDependencies } from '../../../core/es-modules/package-manager/built-in-dependencies-list'
import type { StateSelector } from 'zustand'
Expand Down Expand Up @@ -85,6 +88,7 @@ const moveOrReorderStrategies: MetaCanvasStrategy = (
keyboardAbsoluteMoveStrategy,
keyboardReorderStrategy,
convertToAbsoluteAndMoveStrategy,
convertToAbsoluteAndMoveAndSetParentFixedStrategy,
reorderSliderStategy,
],
)
Expand Down
2 changes: 1 addition & 1 deletion ...rc/components/canvas/canvas-strategies/strategies/ancestor-metastrategy.spec.browser2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ describe('finds an applicable strategy for the nearest ancestor', () => {
runTest(codeElementWithSibling, pathForShallowNestedElement, (editor) => {
const strategies = editor.getEditorState().strategyState.sortedApplicableStrategies

expect(strategies?.length).toEqual(2)
expect(strategies?.length).toEqual(3)
if (strategies == null) {
// here for type assertion
throw new Error('`strategies` should not be null')
Expand Down
Loading