@jupyterlab/apputils-extension 4.0.0-beta.2 → 4.0.0-rc.1

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 (7) hide show
  1. package/lib/announcements.js.map +1 -1
  2. package/lib/notificationplugin.js +15 -7
  3. package/lib/notificationplugin.js.map +1 -1
  4. package/package.json +19 -19
  5. package/src/announcements.ts +6 -2
  6. package/src/notificationplugin.tsx +61 -25
  7. package/style/notification.css +17 -1
package/lib/announcements.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"announcements.js","sourceRoot":"","sources":["../src/announcements.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"announcements.js","sourceRoot":"","sources":["../src/announcements.ts"],"names":[],"mappings":"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"}
package/lib/notificationplugin.js CHANGED
@@ -14,6 +14,10 @@ import { createRoot } from 'react-dom/client';
14
14
  * Toast close button class
15
15
  */
16
16
  const TOAST_CLOSE_BUTTON_CLASS = 'jp-Notification-Toast-Close';
17
+ /**
18
+ * Toast close button class right margin required due to custom hover effect
19
+ */
20
+ const TOAST_CLOSE_BUTTON_MARGIN_CLASS = 'jp-Notification-Toast-Close-Margin';
17
21
  /**
18
22
  * Maximal number of characters displayed in a notification.
19
23
  */
@@ -105,8 +109,7 @@ function NotificationCenter(props) {
105
109
  React.createElement("div", { className: "Toastify__toast-body" },
106
110
  icon && (React.createElement("div", { className: "Toastify__toast-icon" }, icon({ theme: 'light', type: toastType }))),
107
111
  React.createElement("div", null, Private.createContent(message, closeNotification, options.actions))),
108
- React.createElement("button", { className: `jp-Button jp-mod-minimal ${TOAST_CLOSE_BUTTON_CLASS}`, title: trans.__('Dismiss notification'), onClick: closeNotification },
109
- React.createElement(deleteIcon.react, { className: "jp-icon-hover", tag: "span" })))));
112
+ React.createElement(Private.CloseButton, { close: closeNotification, closeIcon: deleteIcon.react, title: trans.__('Dismiss notification'), closeIconMargin: true }))));
110
113
  }))))));
111
114
  }
112
115
  /**
@@ -156,7 +159,7 @@ class NotificationStatusModel extends VDomModel {
156
159
  }
157
160
  this.stateChanged.emit();
158
161
  }
159
- onNotificationChanged(manager, change) {
162
+ onNotificationChanged(_, change) {
160
163
  // Set private attribute to trigger only once the signal emission
161
164
  this._count = this.manager.count;
162
165
  const { autoClose } = change.notification.options;
@@ -390,9 +393,14 @@ var Private;
390
393
  */
391
394
  let toastify = null;
392
395
  function CloseButton(props) {
396
+ var _a;
397
+ return (React.createElement("button", { className: `jp-Button jp-mod-minimal ${TOAST_CLOSE_BUTTON_CLASS}${props.closeIconMargin ? ` ${TOAST_CLOSE_BUTTON_MARGIN_CLASS}` : ''}`, title: (_a = props.title) !== null && _a !== void 0 ? _a : '', onClick: props.close },
398
+ React.createElement(props.closeIcon, { className: "jp-icon-hover", tag: "span" })));
399
+ }
400
+ Private.CloseButton = CloseButton;
401
+ function ToastifyCloseButton(props) {
393
402
  const trans = Private.translator.load('jupyterlab');
394
- return (React.createElement("button", { className: `jp-Button jp-mod-minimal ${TOAST_CLOSE_BUTTON_CLASS}`, title: trans.__('Hide notification'), onClick: props.closeToast },
395
- React.createElement(closeIcon.react, { className: "jp-icon-hover", tag: "span" })));
403
+ return (React.createElement(CloseButton, { close: props.closeToast, closeIcon: closeIcon.react, title: trans.__('Hide notification') }));
396
404
  }
397
405
  let waitForToastify = null;
398
406
  /**
@@ -412,7 +420,7 @@ var Private;
412
420
  const container = document.body.appendChild(document.createElement('div'));
413
421
  container.id = 'react-toastify-container';
414
422
  const root = createRoot(container);
415
- root.render(React.createElement(toastify.ToastContainer, { draggable: false, closeOnClick: false, hideProgressBar: true, newestOnTop: true, pauseOnFocusLoss: true, pauseOnHover: true, position: "bottom-right", className: "jp-toastContainer", transition: toastify.Slide, closeButton: CloseButton }));
423
+ root.render(React.createElement(toastify.ToastContainer, { draggable: false, closeOnClick: false, hideProgressBar: true, newestOnTop: true, pauseOnFocusLoss: true, pauseOnHover: true, position: "bottom-right", className: "jp-toastContainer", transition: toastify.Slide, closeButton: ToastifyCloseButton }));
416
424
  waitForToastify.resolve();
417
425
  }
418
426
  return toastify.toast;
@@ -464,7 +472,7 @@ var Private;
464
472
  ? message.slice(0, MAX_MESSAGE_LENGTH) + '…'
465
473
  : message;
466
474
  return (React.createElement(React.Fragment, null,
467
- React.createElement("div", null, shortenMessage.split('\n').map((part, index) => (React.createElement(React.Fragment, { key: `part-${index}` },
475
+ React.createElement("div", { className: "jp-toast-message" }, shortenMessage.split('\n').map((part, index) => (React.createElement(React.Fragment, { key: `part-${index}` },
468
476
  index > 0 ? React.createElement("br", null) : null,
469
477
  part)))),
470
478
  ((_a = actions === null || actions === void 0 ? void 0 : actions.length) !== null && _a !== void 0 ? _a : 0) > 0 && (React.createElement("div", { className: "jp-toast-buttonBar" },
package/lib/notificationplugin.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"notificationplugin.js","sourceRoot":"","sources":["../src/notificationplugin.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"notificationplugin.js","sourceRoot":"","sources":["../src/notificationplugin.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jupyterlab/apputils-extension",
3
- "version": "4.0.0-beta.2",
3
+ "version": "4.0.0-rc.1",
4
4
  "description": "JupyterLab - Application Utilities Extension",
5
5
  "homepage": "https://github.com/jupyterlab/jupyterlab",
6
6
  "bugs": {
@@ -38,26 +38,26 @@
38
38
  "watch": "tsc -b --watch"
39
39
  },
40
40
  "dependencies": {
41
- "@jupyterlab/application": "^4.0.0-beta.2",
42
- "@jupyterlab/apputils": "^4.0.0-beta.2",
43
- "@jupyterlab/coreutils": "^6.0.0-beta.2",
44
- "@jupyterlab/docregistry": "^4.0.0-beta.2",
45
- "@jupyterlab/filebrowser": "^4.0.0-beta.2",
46
- "@jupyterlab/mainmenu": "^4.0.0-beta.2",
47
- "@jupyterlab/rendermime-interfaces": "^3.8.0-beta.2",
48
- "@jupyterlab/services": "^7.0.0-beta.2",
49
- "@jupyterlab/settingregistry": "^4.0.0-beta.2",
50
- "@jupyterlab/statedb": "^4.0.0-beta.2",
51
- "@jupyterlab/statusbar": "^4.0.0-beta.2",
52
- "@jupyterlab/translation": "^4.0.0-beta.2",
53
- "@jupyterlab/ui-components": "^4.0.0-beta.2",
41
+ "@jupyterlab/application": "^4.0.0-rc.1",
42
+ "@jupyterlab/apputils": "^4.0.0-rc.1",
43
+ "@jupyterlab/coreutils": "^6.0.0-rc.1",
44
+ "@jupyterlab/docregistry": "^4.0.0-rc.1",
45
+ "@jupyterlab/filebrowser": "^4.0.0-rc.1",
46
+ "@jupyterlab/mainmenu": "^4.0.0-rc.1",
47
+ "@jupyterlab/rendermime-interfaces": "^3.8.0-rc.1",
48
+ "@jupyterlab/services": "^7.0.0-rc.1",
49
+ "@jupyterlab/settingregistry": "^4.0.0-rc.1",
50
+ "@jupyterlab/statedb": "^4.0.0-rc.1",
51
+ "@jupyterlab/statusbar": "^4.0.0-rc.1",
52
+ "@jupyterlab/translation": "^4.0.0-rc.1",
53
+ "@jupyterlab/ui-components": "^4.0.0-rc.1",
54
54
  "@lumino/algorithm": "^2.0.0",
55
- "@lumino/commands": "^2.1.0",
56
- "@lumino/coreutils": "^2.1.0",
57
- "@lumino/disposable": "^2.1.0",
55
+ "@lumino/commands": "^2.1.1",
56
+ "@lumino/coreutils": "^2.1.1",
57
+ "@lumino/disposable": "^2.1.1",
58
58
  "@lumino/domutils": "^2.0.0",
59
- "@lumino/polling": "^2.1.0",
60
- "@lumino/widgets": "^2.1.0",
59
+ "@lumino/polling": "^2.1.1",
60
+ "@lumino/widgets": "^2.1.1",
61
61
  "react": "^18.2.0",
62
62
  "react-dom": "^18.2.0",
63
63
  "react-toastify": "^9.0.8"
package/src/announcements.ts CHANGED
@@ -161,7 +161,9 @@ export const announcements: JupyterFrontEndPlugin<void> = {
161
161
  if ((settings?.get('fetchNews').composite ?? 'false') === 'true') {
162
162
  try {
163
163
  const response = await requestAPI<{
164
- news: (Notification.INotification & { link: [string, string] })[];
164
+ news: (Notification.INotification & {
165
+ link?: [string, string];
166
+ })[];
165
167
  }>(NEWS_API_URL);
166
168
 
167
169
  for (const { link, message, type, options } of response.news) {
@@ -220,7 +222,9 @@ export const announcements: JupyterFrontEndPlugin<void> = {
220
222
  if ((settings?.get('checkForUpdates').composite as boolean) ?? true) {
221
223
  const response = await requestAPI<{
222
224
  notification:
223
- | (Notification.INotification & { link: [string, string] })
225
+ | (Notification.INotification & {
226
+ link?: [string, string];
227
+ })
224
228
  | null;
225
229
  }>(UPDATE_API_URL);
226
230
 
package/src/notificationplugin.tsx CHANGED
@@ -30,6 +30,7 @@ import {
30
30
  Button,
31
31
  closeIcon,
32
32
  deleteIcon,
33
+ LabIcon,
33
34
  ToolbarButtonComponent,
34
35
  UseSignal,
35
36
  VDomModel
@@ -58,6 +59,11 @@ import type {
58
59
  */
59
60
  const TOAST_CLOSE_BUTTON_CLASS = 'jp-Notification-Toast-Close';
60
61
 
62
+ /**
63
+ * Toast close button class right margin required due to custom hover effect
64
+ */
65
+ const TOAST_CLOSE_BUTTON_MARGIN_CLASS = 'jp-Notification-Toast-Close-Margin';
66
+
61
67
  /**
62
68
  * Maximal number of characters displayed in a notification.
63
69
  */
@@ -169,13 +175,13 @@ function NotificationCenter(props: INotificationCenterProps): JSX.Element {
169
175
  icon={deleteIcon}
170
176
  tooltip={trans.__('Dismiss all notifications')}
171
177
  enabled={manager.count > 0}
172
- ></ToolbarButtonComponent>
178
+ />
173
179
  <ToolbarButtonComponent
174
180
  actualOnClick={true}
175
181
  onClick={onClose}
176
182
  icon={closeIcon}
177
183
  tooltip={trans.__('Hide notifications')}
178
- ></ToolbarButtonComponent>
184
+ />
179
185
  </h2>
180
186
  <ol className="jp-Notification-List">
181
187
  {notifications.map(notification => {
@@ -217,16 +223,12 @@ function NotificationCenter(props: INotificationCenterProps): JSX.Element {
217
223
  )}
218
224
  </div>
219
225
  </div>
220
- <button
221
- className={`jp-Button jp-mod-minimal ${TOAST_CLOSE_BUTTON_CLASS}`}
226
+ <Private.CloseButton
227
+ close={closeNotification}
228
+ closeIcon={deleteIcon.react}
222
229
  title={trans.__('Dismiss notification')}
223
- onClick={closeNotification}
224
- >
225
- <deleteIcon.react
226
- className="jp-icon-hover"
227
- tag="span"
228
- ></deleteIcon.react>
229
- </button>
230
+ closeIconMargin
231
+ />
230
232
  </div>
231
233
  </li>
232
234
  );
@@ -287,7 +289,7 @@ class NotificationStatusModel extends VDomModel {
287
289
  }
288
290
 
289
291
  protected onNotificationChanged(
290
- manager: NotificationManager,
292
+ _: NotificationManager,
291
293
  change: Notification.IChange
292
294
  ): void {
293
295
  // Set private attribute to trigger only once the signal emission
@@ -355,8 +357,8 @@ function NotificationStatus(props: INotificationStatusProps): JSX.Element {
355
357
  <TextItem
356
358
  className="jp-Notification-Status-Text"
357
359
  source={`${props.count}`}
358
- ></TextItem>
359
- <bellIcon.react top={'2px'} stylesheet={'statusBar'}></bellIcon.react>
360
+ />
361
+ <bellIcon.react top={'2px'} stylesheet={'statusBar'} />
360
362
  </GroupItem>
361
363
  );
362
364
  }
@@ -493,7 +495,7 @@ export const notificationPlugin: JupyterFrontEndPlugin<void> = {
493
495
  popup?.dispose();
494
496
  }}
495
497
  trans={trans}
496
- ></NotificationCenter>
498
+ />
497
499
  );
498
500
  notificationList.addClass('jp-Notification-Center');
499
501
 
@@ -614,7 +616,7 @@ export const notificationPlugin: JupyterFrontEndPlugin<void> = {
614
616
  highlight={model.highlight}
615
617
  trans={trans}
616
618
  onClick={displayNotifications}
617
- ></NotificationStatus>
619
+ />
618
620
  );
619
621
  }}
620
622
  </UseSignal>
@@ -641,19 +643,53 @@ namespace Private {
641
643
  */
642
644
  let toastify: typeof ReactToastify | null = null;
643
645
 
644
- function CloseButton(props: CloseButtonProps): JSX.Element {
645
- const trans = translator.load('jupyterlab');
646
+ /**
647
+ * Interface for CloseButton component
648
+ */
649
+ export interface ICloseButtonProps
650
+ extends React.DetailedHTMLProps<
651
+ React.ButtonHTMLAttributes<HTMLButtonElement>,
652
+ HTMLButtonElement
653
+ > {
654
+ /**
655
+ * A function to handle a close event when the CloseButton is clicked
656
+ */
657
+ close: (e?: React.MouseEvent<HTMLElement, MouseEvent>) => void;
658
+ /**
659
+ * The LabIcon component to be used as the close icon
660
+ */
661
+ closeIcon: LabIcon.IReact;
662
+ /**
663
+ * Optional boolean to apply margin to the close icon. Default is false.
664
+ */
665
+ closeIconMargin?: boolean;
666
+ }
667
+
668
+ export function CloseButton(props: ICloseButtonProps) {
646
669
  return (
647
670
  <button
648
- className={`jp-Button jp-mod-minimal ${TOAST_CLOSE_BUTTON_CLASS}`}
649
- title={trans.__('Hide notification')}
650
- onClick={props.closeToast}
671
+ className={`jp-Button jp-mod-minimal ${TOAST_CLOSE_BUTTON_CLASS}${
672
+ props.closeIconMargin ? ` ${TOAST_CLOSE_BUTTON_MARGIN_CLASS}` : ''
673
+ }`}
674
+ title={props.title ?? ''}
675
+ onClick={props.close}
651
676
  >
652
- <closeIcon.react className="jp-icon-hover" tag="span"></closeIcon.react>
677
+ <props.closeIcon className="jp-icon-hover" tag="span" />
653
678
  </button>
654
679
  );
655
680
  }
656
681
 
682
+ function ToastifyCloseButton(props: CloseButtonProps): JSX.Element {
683
+ const trans = translator.load('jupyterlab');
684
+ return (
685
+ <CloseButton
686
+ close={props.closeToast}
687
+ closeIcon={closeIcon.react}
688
+ title={trans.__('Hide notification')}
689
+ />
690
+ );
691
+ }
692
+
657
693
  /**
658
694
  * Helper interface for 'react-toastify'.toast
659
695
  */
@@ -750,8 +786,8 @@ namespace Private {
750
786
  position="bottom-right"
751
787
  className="jp-toastContainer"
752
788
  transition={toastify.Slide}
753
- closeButton={CloseButton}
754
- ></toastify.ToastContainer>
789
+ closeButton={ToastifyCloseButton}
790
+ />
755
791
  );
756
792
 
757
793
  waitForToastify.resolve();
@@ -834,7 +870,7 @@ namespace Private {
834
870
  : message;
835
871
  return (
836
872
  <>
837
- <div>
873
+ <div className="jp-toast-message">
838
874
  {shortenMessage.split('\n').map((part, index) => (
839
875
  <React.Fragment key={`part-${index}`}>
840
876
  {index > 0 ? <br /> : null}
package/style/notification.css CHANGED
@@ -83,6 +83,7 @@
83
83
 
84
84
  .Toastify__toast {
85
85
  min-height: unset;
86
+ padding: 4px;
86
87
  font-size: var(--jp-ui-font-size1);
87
88
  border-width: var(--jp-border-width);
88
89
  border-radius: var(--jp-border-radius);
@@ -91,12 +92,22 @@
91
92
  cursor: default;
92
93
  }
93
94
 
95
+ .Toastify__toast-body {
96
+ display: flex;
97
+ flex-grow: 1;
98
+ }
99
+
94
100
  .jp-Notification-Toast-Close {
95
- align-self: start;
96
101
  padding: 0;
102
+ position: absolute;
103
+ right: 0.1px;
97
104
  cursor: pointer;
98
105
  }
99
106
 
107
+ .jp-Notification-Toast-Close-Margin {
108
+ margin-right: 4px;
109
+ }
110
+
100
111
  .jp-toastContainer .jp-Notification-Toast-Close:hover {
101
112
  /* The close button has its own hover style */
102
113
  background: none;
@@ -131,6 +142,10 @@
131
142
  text-decoration: underline;
132
143
  }
133
144
 
145
+ .jp-toast-message {
146
+ padding-inline-end: 16px;
147
+ }
148
+
134
149
  /* p elements are added by the markdown rendering.
135
150
  * Removing its default margin allows to reduce toast size.
136
151
  */
@@ -163,6 +178,7 @@
163
178
  flex-direction: row;
164
179
  flex-wrap: nowrap;
165
180
  flex: 0 0 auto;
181
+ padding-block-start: 8px;
166
182
  }
167
183
 
168
184
  .jp-toast-spacer {