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

Jump to bottom

Nb Workbench Toolbar -- separator fixes, test improvements #185370

Merged
merged 2 commits into from
Jun 16, 2023
Merged

Nb Workbench Toolbar -- separator fixes, test improvements #185370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c66464
fix: hidden items between separators -> 2x sep
Yoyokrazy Jun 16, 2023
9338217
improve testing: add extra separator case, add secondary actions
Yoyokrazy Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,6 +1132,9 @@ export function workbenchCalculateActions(initialPrimaryActions: IActionModel[],
if (itemSize !== 0) {
nonZeroAction = true;
}
if (actionModel.action instanceof Separator) {
nonZeroAction = false;
}
} else {
containerFull = true;
if (itemSize === 0) { // size 0 implies a hidden item, keep in primary to allow for Workbench to handle visibility
Expand Down
52 changes: 38 additions & 14 deletions src/vs/workbench/contrib/notebook/test/browser/notebookWorkbenchToolbar.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ interface IActionModel {
* ex: action with size 50 requires 58px of space
*/
suite('workbenchCalculateActions', () => {

const defaultSecondaryActionModels: IActionModel[] = [
{ action: new Action('secondaryAction0', 'Secondary Action 0'), size: 50, visible: true, renderLabel: true },
{ action: new Action('secondaryAction1', 'Secondary Action 1'), size: 50, visible: true, renderLabel: true },
{ action: new Action('secondaryAction2', 'Secondary Action 2'), size: 50, visible: true, renderLabel: true },
];
const defaultSecondaryActions: IAction[] = defaultSecondaryActionModels.map(action => action.action);
const separator: IActionModel = { action: new Separator(), size: 1, visible: true, renderLabel: true };


test('should return empty primary and secondary actions when given empty initial actions', () => {
const result = workbenchCalculateActions([], [], 100);
assert.deepEqual(result.primaryActions, []);
Expand All @@ -37,20 +47,20 @@ suite('workbenchCalculateActions', () => {
{ action: new Action('action1', 'Action 1'), size: 50, visible: true, renderLabel: true },
{ action: new Action('action2', 'Action 2'), size: 50, visible: true, renderLabel: true },
];
const result = workbenchCalculateActions(actions, [], 200);
const result = workbenchCalculateActions(actions, defaultSecondaryActions, 200);
assert.deepEqual(result.primaryActions, actions.map(action => action.action));
assert.deepEqual(result.secondaryActions, []);
assert.deepEqual(result.secondaryActions, defaultSecondaryActions);
});

test.skip('should move actions to secondary when they do not fit within the container width', () => {
test('should move actions to secondary when they do not fit within the container width', () => {
const actions: IActionModel[] = [
{ action: new Action('action0', 'Action 0'), size: 50, visible: true, renderLabel: true },
{ action: new Action('action1', 'Action 1'), size: 50, visible: true, renderLabel: true },
{ action: new Action('action2', 'Action 2'), size: 50, visible: true, renderLabel: true },
];
const result = workbenchCalculateActions(actions, [], 100);
const result = workbenchCalculateActions(actions, defaultSecondaryActions, 100);
assert.deepEqual(result.primaryActions, [actions[0]].map(action => action.action));
assert.deepEqual(result.secondaryActions, [actions[1], actions[2]].map(action => action.action));
assert.deepEqual(result.secondaryActions, [actions[1], actions[2], separator, ...defaultSecondaryActionModels].map(action => action.action));
});

test('should ignore second separator when two separators are in a row', () => {
Expand All @@ -60,9 +70,9 @@ suite('workbenchCalculateActions', () => {
{ action: new Separator(), size: 1, visible: true, renderLabel: true },
{ action: new Action('action1', 'Action 1'), size: 50, visible: true, renderLabel: true },
];
const result = workbenchCalculateActions(actions, [], 125);
const result = workbenchCalculateActions(actions, defaultSecondaryActions, 125);
assert.deepEqual(result.primaryActions, [actions[0], actions[1], actions[3]].map(action => action.action));
assert.deepEqual(result.secondaryActions, []);
assert.deepEqual(result.secondaryActions, defaultSecondaryActions);
});

test('should ignore separators when they are at the end of the resulting primary actions', () => {
Expand All @@ -72,21 +82,21 @@ suite('workbenchCalculateActions', () => {
{ action: new Action('action1', 'Action 1'), size: 50, visible: true, renderLabel: true },
{ action: new Separator(), size: 1, visible: true, renderLabel: true },
];
const result = workbenchCalculateActions(actions, [], 200);
const result = workbenchCalculateActions(actions, defaultSecondaryActions, 200);
assert.deepEqual(result.primaryActions, [actions[0], actions[1], actions[2]].map(action => action.action));
assert.deepEqual(result.secondaryActions, []);
assert.deepEqual(result.secondaryActions, defaultSecondaryActions);
});

test.skip('should keep actions with size 0 in primary actions', () => {
test('should keep actions with size 0 in primary actions', () => {
const actions: IActionModel[] = [
{ action: new Action('action0', 'Action 0'), size: 50, visible: true, renderLabel: true },
{ action: new Action('action1', 'Action 1'), size: 50, visible: true, renderLabel: true },
{ action: new Action('action2', 'Action 2'), size: 50, visible: true, renderLabel: true },
{ action: new Action('action3', 'Action 3'), size: 0, visible: true, renderLabel: true },
];
const result = workbenchCalculateActions(actions, [], 116);
const result = workbenchCalculateActions(actions, defaultSecondaryActions, 116);
assert.deepEqual(result.primaryActions, [actions[0], actions[1], actions[3]].map(action => action.action));
assert.deepEqual(result.secondaryActions, [actions[2]].map(action => action.action));
assert.deepEqual(result.secondaryActions, [actions[2], separator, ...defaultSecondaryActionModels].map(action => action.action));
});

test('should not render separator if preceeded by size 0 action(s).', () => {
Expand All @@ -95,8 +105,22 @@ suite('workbenchCalculateActions', () => {
{ action: new Separator(), size: 1, visible: true, renderLabel: true },
{ action: new Action('action1', 'Action 1'), size: 50, visible: true, renderLabel: true },
];
const result = workbenchCalculateActions(actions, [], 116);
const result = workbenchCalculateActions(actions, defaultSecondaryActions, 116);
assert.deepEqual(result.primaryActions, [actions[0], actions[2]].map(action => action.action));
assert.deepEqual(result.secondaryActions, []);
assert.deepEqual(result.secondaryActions, defaultSecondaryActions);
});

test('should not render second separator if space between is hidden (size 0) actions.', () => {
const actions: IActionModel[] = [
{ action: new Action('action0', 'Action 0'), size: 50, visible: true, renderLabel: true },
{ action: new Separator(), size: 1, visible: true, renderLabel: true },
{ action: new Action('action1', 'Action 1'), size: 0, visible: true, renderLabel: true },
{ action: new Action('action2', 'Action 2'), size: 0, visible: true, renderLabel: true },
{ action: new Separator(), size: 1, visible: true, renderLabel: true },
{ action: new Action('action3', 'Action 3'), size: 50, visible: true, renderLabel: true },
];
const result = workbenchCalculateActions(actions, defaultSecondaryActions, 300);
assert.deepEqual(result.primaryActions, [actions[0], actions[1], actions[2], actions[3], actions[5]].map(action => action.action));
assert.deepEqual(result.secondaryActions, defaultSecondaryActions);
});
});