flexlayout-react 0.7.8 → 0.7.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. package/ChangeLog.txt +10 -0
  2. package/README.md +10 -1
  3. package/dist/flexlayout.js +4 -4
  4. package/dist/flexlayout_min.js +1 -1
  5. package/lib/DragDrop.js +3 -3
  6. package/lib/DragDrop.js.map +1 -1
  7. package/lib/view/BorderTabSet.js +13 -5
  8. package/lib/view/BorderTabSet.js.map +1 -1
  9. package/lib/view/FloatingWindow.js +16 -12
  10. package/lib/view/FloatingWindow.js.map +1 -1
  11. package/lib/view/TabSet.js +10 -11
  12. package/lib/view/TabSet.js.map +1 -1
  13. package/package.json +1 -1
  14. package/src/DragDrop.ts +4 -4
  15. package/src/view/BorderTabSet.tsx +23 -7
  16. package/src/view/FloatingWindow.tsx +16 -12
  17. package/src/view/TabSet.tsx +19 -20
package/lib/view/BorderTabSet.js CHANGED
@@ -17,7 +17,7 @@ const BorderTabSet = (props) => {
17
17
  const toolbarRef = React.useRef(null);
18
18
  const overflowbuttonRef = React.useRef(null);
19
19
  const stickyButtonsRef = React.useRef(null);
20
- const { selfRef, position, userControlledLeft, hiddenTabs, onMouseWheel } = (0, TabOverflowHook_1.useTabOverflow)(border, Orientation_1.Orientation.flip(border.getOrientation()), toolbarRef, stickyButtonsRef);
20
+ const { selfRef, position, userControlledLeft, hiddenTabs, onMouseWheel, tabsTruncated } = (0, TabOverflowHook_1.useTabOverflow)(border, Orientation_1.Orientation.flip(border.getOrientation()), toolbarRef, stickyButtonsRef);
21
21
  const onAuxMouseClick = (event) => {
22
22
  if ((0, Utils_1.isAuxMouseEvent)(event)) {
23
23
  layout.auxMouseClick(border, event);
@@ -71,10 +71,10 @@ const BorderTabSet = (props) => {
71
71
  }
72
72
  // allow customization of tabset right/bottom buttons
73
73
  let buttons = [];
74
- const renderState = { headerContent: undefined, buttons, stickyButtons: [], headerButtons: [] };
74
+ let stickyButtons = [];
75
+ const renderState = { headerContent: undefined, buttons, stickyButtons: stickyButtons, headerButtons: [] };
75
76
  layout.customizeTabSet(border, renderState);
76
77
  buttons = renderState.buttons;
77
- let toolbar;
78
78
  if (hiddenTabs.length > 0) {
79
79
  const overflowTitle = layout.i18nName(I18nLabel_1.I18nLabel.Overflow_Menu_Tooltip);
80
80
  let overflowContent;
@@ -86,7 +86,15 @@ const BorderTabSet = (props) => {
86
86
  icons.more,
87
87
  React.createElement("div", { className: cm(Types_1.CLASSES.FLEXLAYOUT__TAB_BUTTON_OVERFLOW_COUNT) }, hiddenTabs.length)));
88
88
  }
89
- buttons.push(React.createElement("button", { key: "overflowbutton", ref: overflowbuttonRef, className: cm(Types_1.CLASSES.FLEXLAYOUT__BORDER_TOOLBAR_BUTTON) + " " + cm(Types_1.CLASSES.FLEXLAYOUT__BORDER_TOOLBAR_BUTTON_OVERFLOW) + " " + cm(Types_1.CLASSES.FLEXLAYOUT__BORDER_TOOLBAR_BUTTON_OVERFLOW_ + border.getLocation().getName()), title: overflowTitle, onClick: onOverflowClick, onMouseDown: onInterceptMouseDown, onTouchStart: onInterceptMouseDown }, overflowContent));
89
+ buttons.unshift(React.createElement("button", { key: "overflowbutton", ref: overflowbuttonRef, className: cm(Types_1.CLASSES.FLEXLAYOUT__BORDER_TOOLBAR_BUTTON) + " " + cm(Types_1.CLASSES.FLEXLAYOUT__BORDER_TOOLBAR_BUTTON_OVERFLOW) + " " + cm(Types_1.CLASSES.FLEXLAYOUT__BORDER_TOOLBAR_BUTTON_OVERFLOW_ + border.getLocation().getName()), title: overflowTitle, onClick: onOverflowClick, onMouseDown: onInterceptMouseDown, onTouchStart: onInterceptMouseDown }, overflowContent));
90
+ }
91
+ if (stickyButtons.length > 0) {
92
+ if (tabsTruncated) {
93
+ buttons = [...stickyButtons, ...buttons];
94
+ }
95
+ else {
96
+ tabs.push(React.createElement("div", { ref: stickyButtonsRef, key: "sticky_buttons_container", onMouseDown: onInterceptMouseDown, onTouchStart: onInterceptMouseDown, onDragStart: (e) => { e.preventDefault(); }, className: cm(Types_1.CLASSES.FLEXLAYOUT__TAB_TOOLBAR_STICKY_BUTTONS_CONTAINER) }, stickyButtons));
97
+ }
90
98
  }
91
99
  const selectedIndex = border.getSelected();
92
100
  if (selectedIndex !== -1) {
@@ -96,7 +104,7 @@ const BorderTabSet = (props) => {
96
104
  buttons.push(React.createElement("button", { key: "float", title: floatTitle, className: cm(Types_1.CLASSES.FLEXLAYOUT__BORDER_TOOLBAR_BUTTON) + " " + cm(Types_1.CLASSES.FLEXLAYOUT__BORDER_TOOLBAR_BUTTON_FLOAT), onClick: onFloatTab, onMouseDown: onInterceptMouseDown, onTouchStart: onInterceptMouseDown }, (typeof icons.popout === "function") ? icons.popout(selectedTabNode) : icons.popout));
97
105
  }
98
106
  }
99
- toolbar = (React.createElement("div", { key: "toolbar", ref: toolbarRef, className: cm(Types_1.CLASSES.FLEXLAYOUT__BORDER_TOOLBAR) + " " + cm(Types_1.CLASSES.FLEXLAYOUT__BORDER_TOOLBAR_ + border.getLocation().getName()) }, buttons));
107
+ const toolbar = (React.createElement("div", { key: "toolbar", ref: toolbarRef, className: cm(Types_1.CLASSES.FLEXLAYOUT__BORDER_TOOLBAR) + " " + cm(Types_1.CLASSES.FLEXLAYOUT__BORDER_TOOLBAR_ + border.getLocation().getName()) }, buttons));
100
108
  style = layout.styleFont(style);
101
109
  let innerStyle = {};
102
110
  const borderHeight = border.getBorderBarSize() - 1;
package/lib/view/BorderTabSet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BorderTabSet.js","sourceRoot":"","sources":["../../src/view/BorderTabSet.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BorderTabSet.js","sourceRoot":"","sources":["../../src/view/BorderTabSet.tsx"],"names":[],"mappings":"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"}
package/lib/view/FloatingWindow.js CHANGED
@@ -14,6 +14,7 @@ const FloatingWindow = (props) => {
14
14
  if (timerId.current) {
15
15
  clearTimeout(timerId.current);
16
16
  }
17
+ let isMounted = true;
17
18
  const r = rect;
18
19
  // Make a local copy of the styles from the current window which will be passed into
19
20
  // the floating window. window.document.styleSheets is mutable and we can't guarantee
@@ -51,18 +52,20 @@ const FloatingWindow = (props) => {
51
52
  }
52
53
  });
53
54
  popoutWindow.current.addEventListener("load", () => {
54
- const popoutDocument = popoutWindow.current.document;
55
- popoutDocument.title = title;
56
- const popoutContent = popoutDocument.createElement("div");
57
- popoutContent.className = Types_1.CLASSES.FLEXLAYOUT__FLOATING_WINDOW_CONTENT;
58
- popoutDocument.body.appendChild(popoutContent);
59
- copyStyles(popoutDocument, styles).then(() => {
60
- setContent(popoutContent);
61
- });
62
- // listen for popout unloading (needs to be after load for safari)
63
- popoutWindow.current.addEventListener("beforeunload", () => {
64
- onCloseWindow(id);
65
- });
55
+ if (isMounted) {
56
+ const popoutDocument = popoutWindow.current.document;
57
+ popoutDocument.title = title;
58
+ const popoutContent = popoutDocument.createElement("div");
59
+ popoutContent.className = Types_1.CLASSES.FLEXLAYOUT__FLOATING_WINDOW_CONTENT;
60
+ popoutDocument.body.appendChild(popoutContent);
61
+ copyStyles(popoutDocument, styles).then(() => {
62
+ setContent(popoutContent);
63
+ });
64
+ // listen for popout unloading (needs to be after load for safari)
65
+ popoutWindow.current.addEventListener("beforeunload", () => {
66
+ onCloseWindow(id);
67
+ });
68
+ }
66
69
  });
67
70
  }
68
71
  else {
@@ -70,6 +73,7 @@ const FloatingWindow = (props) => {
70
73
  onCloseWindow(id);
71
74
  }
72
75
  return () => {
76
+ isMounted = false;
73
77
  // delay so refresh will close window
74
78
  timerId.current = setTimeout(() => {
75
79
  if (popoutWindow.current) {
package/lib/view/FloatingWindow.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"FloatingWindow.js","sourceRoot":"","sources":["../../src/view/FloatingWindow.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"FloatingWindow.js","sourceRoot":"","sources":["../../src/view/FloatingWindow.tsx"],"names":[],"mappings":"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"}
package/lib/view/TabSet.js CHANGED
@@ -119,15 +119,6 @@ const TabSet = (props) => {
119
119
  stickyButtons = renderState.stickyButtons;
120
120
  buttons = renderState.buttons;
121
121
  headerButtons = renderState.headerButtons;
122
- if (stickyButtons.length > 0) {
123
- if (tabsTruncated) {
124
- buttons = [...stickyButtons, ...buttons];
125
- }
126
- else {
127
- tabs.push(React.createElement("div", { ref: stickyButtonsRef, key: "sticky_buttons_container", onMouseDown: onInterceptMouseDown, onTouchStart: onInterceptMouseDown, onDragStart: (e) => { e.preventDefault(); }, className: cm(Types_1.CLASSES.FLEXLAYOUT__TAB_TOOLBAR_STICKY_BUTTONS_CONTAINER) }, stickyButtons));
128
- }
129
- }
130
- let toolbar;
131
122
  if (hiddenTabs.length > 0) {
132
123
  const overflowTitle = layout.i18nName(I18nLabel_1.I18nLabel.Overflow_Menu_Tooltip);
133
124
  let overflowContent;
@@ -139,7 +130,15 @@ const TabSet = (props) => {
139
130
  icons.more,
140
131
  React.createElement("div", { className: cm(Types_1.CLASSES.FLEXLAYOUT__TAB_BUTTON_OVERFLOW_COUNT) }, hiddenTabs.length)));
141
132
  }
142
- buttons.push(React.createElement("button", { key: "overflowbutton", "data-layout-path": path + "/button/overflow", ref: overflowbuttonRef, className: cm(Types_1.CLASSES.FLEXLAYOUT__TAB_TOOLBAR_BUTTON) + " " + cm(Types_1.CLASSES.FLEXLAYOUT__TAB_BUTTON_OVERFLOW), title: overflowTitle, onClick: onOverflowClick, onMouseDown: onInterceptMouseDown, onTouchStart: onInterceptMouseDown }, overflowContent));
133
+ buttons.unshift(React.createElement("button", { key: "overflowbutton", "data-layout-path": path + "/button/overflow", ref: overflowbuttonRef, className: cm(Types_1.CLASSES.FLEXLAYOUT__TAB_TOOLBAR_BUTTON) + " " + cm(Types_1.CLASSES.FLEXLAYOUT__TAB_BUTTON_OVERFLOW), title: overflowTitle, onClick: onOverflowClick, onMouseDown: onInterceptMouseDown, onTouchStart: onInterceptMouseDown }, overflowContent));
134
+ }
135
+ if (stickyButtons.length > 0) {
136
+ if (tabsTruncated) {
137
+ buttons = [...stickyButtons, ...buttons];
138
+ }
139
+ else {
140
+ tabs.push(React.createElement("div", { ref: stickyButtonsRef, key: "sticky_buttons_container", onMouseDown: onInterceptMouseDown, onTouchStart: onInterceptMouseDown, onDragStart: (e) => { e.preventDefault(); }, className: cm(Types_1.CLASSES.FLEXLAYOUT__TAB_TOOLBAR_STICKY_BUTTONS_CONTAINER) }, stickyButtons));
141
+ }
143
142
  }
144
143
  if (selectedTabNode !== undefined && layout.isSupportsPopout() && selectedTabNode.isEnableFloat() && !selectedTabNode.isFloating()) {
145
144
  const floatTitle = layout.i18nName(I18nLabel_1.I18nLabel.Float_Tab);
@@ -158,7 +157,7 @@ const TabSet = (props) => {
158
157
  const btns = showHeader ? headerButtons : buttons;
159
158
  btns.push(React.createElement("button", { key: "close", "data-layout-path": path + "/button/close", title: title, className: cm(Types_1.CLASSES.FLEXLAYOUT__TAB_TOOLBAR_BUTTON) + " " + cm(Types_1.CLASSES.FLEXLAYOUT__TAB_TOOLBAR_BUTTON_CLOSE), onClick: onClose, onMouseDown: onInterceptMouseDown, onTouchStart: onInterceptMouseDown }, (typeof icons.closeTabset === "function") ? icons.closeTabset(node) : icons.closeTabset));
160
159
  }
161
- toolbar = (React.createElement("div", { key: "toolbar", ref: toolbarRef, className: cm(Types_1.CLASSES.FLEXLAYOUT__TAB_TOOLBAR), onMouseDown: onInterceptMouseDown, onTouchStart: onInterceptMouseDown, onDragStart: (e) => { e.preventDefault(); } }, buttons));
160
+ const toolbar = (React.createElement("div", { key: "toolbar", ref: toolbarRef, className: cm(Types_1.CLASSES.FLEXLAYOUT__TAB_TOOLBAR), onMouseDown: onInterceptMouseDown, onTouchStart: onInterceptMouseDown, onDragStart: (e) => { e.preventDefault(); } }, buttons));
162
161
  let header;
163
162
  let tabStrip;
164
163
  let tabStripClasses = cm(Types_1.CLASSES.FLEXLAYOUT__TABSET_TABBAR_OUTER);
package/lib/view/TabSet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TabSet.js","sourceRoot":"","sources":["../../src/view/TabSet.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TabSet.js","sourceRoot":"","sources":["../../src/view/TabSet.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "flexlayout-react",
3
- "version": "0.7.8",
3
+ "version": "0.7.10",
4
4
  "description": "A multi-tab docking layout manager",
5
5
  "main": "lib/index.js",
6
6
  "types": "./declarations/index.d.ts",
package/src/DragDrop.ts CHANGED
@@ -153,6 +153,10 @@ export class DragDrop {
153
153
  return;
154
154
  }
155
155
 
156
+ if (this._dragging) {
157
+ return;
158
+ }
159
+
156
160
  this._lastEvent = event;
157
161
 
158
162
  if (currentDocument) {
@@ -169,10 +173,6 @@ export class DragDrop {
169
173
  const posEvent = this._getLocationEvent(event);
170
174
  this.addGlass(fDragCancel);
171
175
 
172
- if (this._dragging) {
173
- console.warn("this._dragging true on startDrag should never happen");
174
- }
175
-
176
176
  if (event) {
177
177
  this._startX = posEvent.clientX;
178
178
  this._startY = posEvent.clientY;
package/src/view/BorderTabSet.tsx CHANGED
@@ -30,7 +30,7 @@ export const BorderTabSet = (props: IBorderTabSetProps) => {
30
30
  const overflowbuttonRef = React.useRef<HTMLButtonElement | null>(null);
31
31
  const stickyButtonsRef = React.useRef<HTMLDivElement | null>(null);
32
32
 
33
- const { selfRef, position, userControlledLeft, hiddenTabs, onMouseWheel } = useTabOverflow(border, Orientation.flip(border.getOrientation()), toolbarRef, stickyButtonsRef);
33
+ const { selfRef, position, userControlledLeft, hiddenTabs, onMouseWheel, tabsTruncated } = useTabOverflow(border, Orientation.flip(border.getOrientation()), toolbarRef, stickyButtonsRef);
34
34
 
35
35
  const onAuxMouseClick = (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
36
36
  if (isAuxMouseEvent(event)) {
@@ -42,7 +42,7 @@ export const BorderTabSet = (props: IBorderTabSetProps) => {
42
42
  layout.showContextMenu(border, event);
43
43
  };
44
44
 
45
- const onInterceptMouseDown = (event: React.MouseEvent<HTMLDivElement, MouseEvent> | React.MouseEvent<HTMLButtonElement, MouseEvent> | React.TouchEvent<HTMLButtonElement>) => {
45
+ const onInterceptMouseDown = (event: React.MouseEvent | React.TouchEvent) => {
46
46
  event.stopPropagation();
47
47
  };
48
48
 
@@ -116,12 +116,11 @@ export const BorderTabSet = (props: IBorderTabSetProps) => {
116
116
 
117
117
  // allow customization of tabset right/bottom buttons
118
118
  let buttons: any[] = [];
119
- const renderState = { headerContent: undefined, buttons, stickyButtons: [], headerButtons: [] };
119
+ let stickyButtons: any[] = [];
120
+ const renderState = { headerContent: undefined, buttons, stickyButtons: stickyButtons, headerButtons: [] };
120
121
  layout.customizeTabSet(border, renderState);
121
122
  buttons = renderState.buttons;
122
123
 
123
- let toolbar;
124
-
125
124
  if (hiddenTabs.length > 0) {
126
125
  const overflowTitle = layout.i18nName(I18nLabel.Overflow_Menu_Tooltip);
127
126
  let overflowContent;
@@ -133,7 +132,7 @@ export const BorderTabSet = (props: IBorderTabSetProps) => {
133
132
  <div className={cm(CLASSES.FLEXLAYOUT__TAB_BUTTON_OVERFLOW_COUNT)}>{hiddenTabs.length}</div>
134
133
  </>);
135
134
  }
136
- buttons.push(
135
+ buttons.unshift(
137
136
  <button
138
137
  key="overflowbutton"
139
138
  ref={overflowbuttonRef}
@@ -147,6 +146,23 @@ export const BorderTabSet = (props: IBorderTabSetProps) => {
147
146
  </button>
148
147
  );
149
148
  }
149
+
150
+ if (stickyButtons.length > 0) {
151
+ if (tabsTruncated) {
152
+ buttons = [...stickyButtons, ...buttons];
153
+ } else {
154
+ tabs.push(<div
155
+ ref={stickyButtonsRef}
156
+ key="sticky_buttons_container"
157
+ onMouseDown={onInterceptMouseDown}
158
+ onTouchStart={onInterceptMouseDown}
159
+ onDragStart={(e) => { e.preventDefault() }}
160
+ className={cm(CLASSES.FLEXLAYOUT__TAB_TOOLBAR_STICKY_BUTTONS_CONTAINER)}
161
+ >
162
+ {stickyButtons}
163
+ </div>);
164
+ }
165
+ }
150
166
 
151
167
  const selectedIndex = border.getSelected();
152
168
  if (selectedIndex !== -1) {
@@ -167,7 +183,7 @@ export const BorderTabSet = (props: IBorderTabSetProps) => {
167
183
  );
168
184
  }
169
185
  }
170
- toolbar = (
186
+ const toolbar = (
171
187
  <div key="toolbar" ref={toolbarRef} className={cm(CLASSES.FLEXLAYOUT__BORDER_TOOLBAR) + " " + cm(CLASSES.FLEXLAYOUT__BORDER_TOOLBAR_ + border.getLocation().getName())}>
172
188
  {buttons}
173
189
  </div>
package/src/view/FloatingWindow.tsx CHANGED
@@ -30,6 +30,7 @@ export const FloatingWindow = (props: React.PropsWithChildren<IFloatingWindowPro
30
30
  if (timerId.current) {
31
31
  clearTimeout(timerId.current);
32
32
  }
33
+ let isMounted = true;
33
34
  const r = rect;
34
35
  // Make a local copy of the styles from the current window which will be passed into
35
36
  // the floating window. window.document.styleSheets is mutable and we can't guarantee
@@ -68,19 +69,21 @@ export const FloatingWindow = (props: React.PropsWithChildren<IFloatingWindowPro
68
69
  });
69
70
 
70
71
  popoutWindow.current.addEventListener("load", () => {
71
- const popoutDocument = popoutWindow.current!.document;
72
- popoutDocument.title = title;
73
- const popoutContent = popoutDocument.createElement("div");
74
- popoutContent.className = CLASSES.FLEXLAYOUT__FLOATING_WINDOW_CONTENT;
75
- popoutDocument.body.appendChild(popoutContent);
76
- copyStyles(popoutDocument, styles).then(() => {
77
- setContent(popoutContent);
78
- });
72
+ if (isMounted) {
73
+ const popoutDocument = popoutWindow.current!.document;
74
+ popoutDocument.title = title;
75
+ const popoutContent = popoutDocument.createElement("div");
76
+ popoutContent.className = CLASSES.FLEXLAYOUT__FLOATING_WINDOW_CONTENT;
77
+ popoutDocument.body.appendChild(popoutContent);
78
+ copyStyles(popoutDocument, styles).then(() => {
79
+ setContent(popoutContent);
80
+ });
79
81
 
80
- // listen for popout unloading (needs to be after load for safari)
81
- popoutWindow.current!.addEventListener("beforeunload", () => {
82
- onCloseWindow(id);
83
- });
82
+ // listen for popout unloading (needs to be after load for safari)
83
+ popoutWindow.current!.addEventListener("beforeunload", () => {
84
+ onCloseWindow(id);
85
+ });
86
+ }
84
87
  });
85
88
  } else {
86
89
  console.warn(`Unable to open window ${url}`);
@@ -88,6 +91,7 @@ export const FloatingWindow = (props: React.PropsWithChildren<IFloatingWindowPro
88
91
  }
89
92
 
90
93
  return () => {
94
+ isMounted = false;
91
95
  // delay so refresh will close window
92
96
  timerId.current = setTimeout(() => {
93
97
  if (popoutWindow.current) {
package/src/view/TabSet.tsx CHANGED
@@ -167,24 +167,6 @@ export const TabSet = (props: ITabSetProps) => {
167
167
  buttons = renderState.buttons;
168
168
  headerButtons = renderState.headerButtons;
169
169
 
170
- if (stickyButtons.length > 0) {
171
- if (tabsTruncated) {
172
- buttons = [...stickyButtons, ...buttons];
173
- } else {
174
- tabs.push(<div
175
- ref={stickyButtonsRef}
176
- key="sticky_buttons_container"
177
- onMouseDown={onInterceptMouseDown}
178
- onTouchStart={onInterceptMouseDown}
179
- onDragStart={(e) => { e.preventDefault() }}
180
- className={cm(CLASSES.FLEXLAYOUT__TAB_TOOLBAR_STICKY_BUTTONS_CONTAINER)}
181
- >
182
- {stickyButtons}
183
- </div>);
184
- }
185
- }
186
-
187
- let toolbar;
188
170
  if (hiddenTabs.length > 0) {
189
171
  const overflowTitle = layout.i18nName(I18nLabel.Overflow_Menu_Tooltip);
190
172
  let overflowContent;
@@ -196,7 +178,7 @@ export const TabSet = (props: ITabSetProps) => {
196
178
  <div className={cm(CLASSES.FLEXLAYOUT__TAB_BUTTON_OVERFLOW_COUNT)}>{hiddenTabs.length}</div>
197
179
  </>);
198
180
  }
199
- buttons.push(
181
+ buttons.unshift(
200
182
  <button
201
183
  key="overflowbutton"
202
184
  data-layout-path={path + "/button/overflow"}
@@ -213,6 +195,23 @@ export const TabSet = (props: ITabSetProps) => {
213
195
  );
214
196
  }
215
197
 
198
+ if (stickyButtons.length > 0) {
199
+ if (tabsTruncated) {
200
+ buttons = [...stickyButtons, ...buttons];
201
+ } else {
202
+ tabs.push(<div
203
+ ref={stickyButtonsRef}
204
+ key="sticky_buttons_container"
205
+ onMouseDown={onInterceptMouseDown}
206
+ onTouchStart={onInterceptMouseDown}
207
+ onDragStart={(e) => { e.preventDefault() }}
208
+ className={cm(CLASSES.FLEXLAYOUT__TAB_TOOLBAR_STICKY_BUTTONS_CONTAINER)}
209
+ >
210
+ {stickyButtons}
211
+ </div>);
212
+ }
213
+ }
214
+
216
215
  if (selectedTabNode !== undefined && layout.isSupportsPopout() && selectedTabNode.isEnableFloat() && !selectedTabNode.isFloating()) {
217
216
  const floatTitle = layout.i18nName(I18nLabel.Float_Tab);
218
217
  buttons.push(
@@ -268,7 +267,7 @@ export const TabSet = (props: ITabSetProps) => {
268
267
  );
269
268
  }
270
269
 
271
- toolbar = (
270
+ const toolbar = (
272
271
  <div key="toolbar" ref={toolbarRef}
273
272
  className={cm(CLASSES.FLEXLAYOUT__TAB_TOOLBAR)}
274
273
  onMouseDown={onInterceptMouseDown}