Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
20 changes: 13 additions & 7 deletions src/core/Layout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,14 @@ export class Layout {
}
}

/** Marks the root layout as needing recalculation */
public invalidateRoot(): void {
const root = this.getRoot();
/**
* Marks the root layout as needing recalculation
* @param start - Optional container to start searching for the root from
*/
public invalidateRoot(start?: Container): void {
const root = this.getRoot(start);

if (root.destroyed) return;

root._layout!._isDirty = true;
root._onUpdate();
Expand All @@ -244,11 +249,12 @@ export class Layout {

/**
* Finds the root container by traversing up the layout tree
* @param start - Optional container to start searching for the root from
* @returns The root container
*/
public getRoot(): Container {
public getRoot(start?: Container): Container {
// find the root node by traversing up the yoga tree
let root: Container = this.target as Container;
let root: Container = start || (this.target as Container);

while (root.parent?._layout || (root.parent as OverflowContainer)?.isOverflowContainer) {
root = root.parent;
Expand Down Expand Up @@ -278,11 +284,11 @@ export class Layout {
/**
* @ignore
*/
public _onChildRemoved(): void {
public _onChildRemoved(parent?: Container): void {
if (!this.hasParent) return;

this.hasParent = false;
this.invalidateRoot();
this.invalidateRoot(parent);
onChildRemoved(this);
}

Expand Down
2 changes: 2 additions & 0 deletions tests/__tests__/index.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import * as objectFitLayoutViewStories from '../stories/custom/objectFit/objectF
import * as objectFitStories from '../stories/custom/objectFit/objectFit.stories';
import * as isLeafStories from '../stories/custom/leaf/isLeaf.stories';
import * as dynamicTextStories from '../stories/custom/dynamicChanges/dynamicText.stories';
import * as dynamicDeleteStories from '../stories/custom/dynamicChanges/dynamicDelete.stories';
import * as layoutContainerBackgroundStories from '../stories/custom/components/layoutContainerBackground.stories';
import * as layoutContainerStories from '../stories/custom/components/layoutContainer.stories';
import * as applySizeStories from '../stories/custom/applySize/applySize.stories';
Expand Down Expand Up @@ -93,6 +94,7 @@ allStories.objectFitLayoutViewStories = composeStories(objectFitLayoutViewStorie
allStories.objectFitStories = composeStories(objectFitStories);
allStories.isLeafStories = composeStories(isLeafStories);
allStories.dynamicTextStories = composeStories(dynamicTextStories);
allStories.dynamicDeleteStories = composeStories(dynamicDeleteStories);
allStories.layoutContainerBackgroundStories = composeStories(layoutContainerBackgroundStories);
allStories.layoutContainerStories = composeStories(layoutContainerStories);
allStories.applySizeStories = composeStories(applySizeStories);
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 55 additions & 0 deletions tests/stories/custom/dynamicChanges/dynamicDelete.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import { type Text as PixiText } from 'pixi.js';
import React, { type FC } from 'react';
import { ReactStory } from '../../yoga/utils/reactStory';

import type { Meta, StoryObj } from '@storybook/react';

const LayoutComponent: FC = ({}) => {
const refs: Record<string, React.RefObject<PixiText | null>> = {};

for (let i = 0; i < 4; i++) {
refs[`r${i + 1}`] = React.createRef<PixiText>();
}

setTimeout(() => {
Object.values(refs)[2]!.current?.removeFromParent();
}, 100);

return (
<layout config={{ useWebDefaults: false }}>
<node
style={{
width: 300,
height: 300,
padding: 10,
gap: 40,
flexDirection: 'column',
}}
>
<pixiText ref={refs.r1} text="[0]" style={{ fill: 0xffffff }} layout={true} />
<pixiText ref={refs.r2} text="[1]" style={{ fill: 0xffffff }} layout={true} />
<pixiText ref={refs.r3} text="[2]" style={{ fill: 0xffffff }} layout={true} />
<pixiText ref={refs.r4} text="[3]" style={{ fill: 0xffffff }} layout={true} />
</node>
</layout>
);
};

// 👇 This default export determines where your story goes in the story list
const meta: Meta<typeof LayoutComponent> = {
title: 'Yoga/Dynamic Changes/Delete',
component: LayoutComponent,
render: (args) => (
<ReactStory>
<LayoutComponent {...args} />
</ReactStory>
),
};

export default meta;
type Story = StoryObj<typeof LayoutComponent>;

export const Delete: Story = {
tags: ['delay:200'],
args: {},
};
Loading