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

Correctly remove a widget in FLOATING_WIDGET_SEND_BACK #3619

Merged
merged 3 commits into from
May 17, 2022
Merged

Correctly remove a widget in FLOATING_WIDGET_SEND_BACK #3619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a4e518
Remove a widget in FLOATING_WIDGET_SEND_BACK.
GerardasB May 16, 2022
8f9067d
Rush change.
GerardasB May 16, 2022
ff98cee
Typo.
GerardasB May 16, 2022
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
10 changes: 10 additions & 0 deletions common/changes/@itwin/appui-layout-react/fix-widget-send-back_2022-05-16-09-29.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/appui-layout-react",
"comment": "Fix an issue where a widget is not removed correctly in FLOATING_WIDGET_SEND_BACK action.",
"type": "none"
}
],
"packageName": "@itwin/appui-layout-react"
}
40 changes: 20 additions & 20 deletions ui/appui-layout-react/src/appui-layout-react/base/NineZoneState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,29 +582,29 @@ export const NineZoneStateReducer: (state: NineZoneState, action: NineZoneAction
}

if (homeWidget) {
// Add tabs to an existing widget.
homeWidget.tabs.push(...widget.tabs);
removeWidget(state, widget.id);
} else {
const destinationWidgetContainerName = home.widgetId ?? getWidgetPanelSectionId(panel.side, home.widgetIndex);
// if widget container was remove because it was empty insert it
state.widgets[destinationWidgetContainerName] = {
activeTabId: widget.tabs[0],
id: destinationWidgetContainerName,
minimized: false,
tabs: [...widget.tabs],
};

let insertIndex = destinationWidgetContainerName.endsWith("End") ? 1 : 0;
// istanbul ignore next
if (0 === panel.widgets.length)
insertIndex = 0;
panel.widgets.splice(insertIndex, 0, destinationWidgetContainerName);
widget.minimized = false;
if (home.widgetId)
removeWidget(state, widget.id);
else
removeFloatingWidget(state, widget.id);
return;
}

const destinationWidgetContainerName = home.widgetId ?? getWidgetPanelSectionId(panel.side, home.widgetIndex);
// if widget container was removed because it was empty insert it
state.widgets[destinationWidgetContainerName] = {
activeTabId: widget.tabs[0],
id: destinationWidgetContainerName,
minimized: false,
tabs: [...widget.tabs],
};

let insertIndex = destinationWidgetContainerName.endsWith("End") ? 1 : 0;
// istanbul ignore next
if (0 === panel.widgets.length)
insertIndex = 0;
panel.widgets.splice(insertIndex, 0, destinationWidgetContainerName);
widget.minimized = false;

removeWidget(state, widget.id);
return;
}
case "POPOUT_WIDGET_SEND_BACK": {
Expand Down
2 changes: 2 additions & 0 deletions ui/appui-layout-react/src/test/base/NineZoneState.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,7 @@ describe("NineZoneStateReducer", () => {
newState.widgets.leftStart.tabs.should.eql(["t1"]);
newState.widgets.leftEnd.tabs.should.eql(["t2", "t3"]);
should().not.exist(newState.floatingWidgets.byId.fw1);
should().not.exist(newState.widgets.fw1);
newState.floatingWidgets.allIds.indexOf("fw1").should.eq(-1);
});

Expand Down Expand Up @@ -694,6 +695,7 @@ describe("NineZoneStateReducer", () => {
newState.panels.left.widgets.should.eql(["w1", "w2"]);
newState.widgets.w1.tabs.should.eql(["t1", "t2"]);
should().not.exist(newState.floatingWidgets.byId.fw1);
should().not.exist(newState.widgets.fw1);
newState.floatingWidgets.allIds.indexOf("fw1").should.eq(-1);
});

Expand Down