@xh/hoist 79.0.0-SNAPSHOT.1767029174152 → 79.0.0-SNAPSHOT.1767046009354

package/CHANGELOG.md

@@ -17,6 +17,9 @@
 
 ### 💥 Breaking Changes
 
+* Blueprint has been upgraded from version 5 to version 6.  Most apps will not need to change,
+ but see https://github.com/palantir/blueprint/wiki/Blueprint-6.0 for more details.  Also note that
+ any custom css overrides to blueprint will need to be updated to refer to `bp6` instead of `bp5`.
 * Renamed `LoadSupport.loadModel` to `LoadSupport.loadObserver` for clarity. This property is a
   `TaskObserver` instance, not a `HoistModel`. The getter methods `HoistModel.loadModel` and
   `HoistService.loadModel` remain as aliases but are now deprecated and scheduled for removal in
@@ -37,6 +40,7 @@
 * `DashCanvasModel.containerPadding` is now applied to the `react-grid-layout` div by RGL, not to the
   hoist-react provided containing div.  This may affect printing layouts.
 
+
 ### 🐞 Bug Fixes
 
 * Fixed column chooser to display columns in the same order as they appear in the grid.
@@ -56,10 +60,15 @@
 * Improved the efficiency and logging of MsalClient.
 * Improved protections against running stale versions of client app code.
 
+* Grid performance optimizations introduced on an experimental basis.  See
+`GridExperimentalFlags.deltaSort` and `GridExperimentalFlags.disableScrollOptimization`
+
 
 ### 📚 Libraries
 * react-grid-layout `1.5.0 → 2.1.1`
 * hoist-core `35.0.0`
+* @blueprintjs/core: 5.10.5 -> 6.3.2 ,
+* @blueprintjs/datetime: 5.3.7 -> 6.0.6,
 
 ## 78.1.4 - 2025-12-05
 

package/admin/App.scss

@@ -12,7 +12,7 @@
     background-color: var(--xh-grid-bg-odd);
     border-right: var(--xh-border-solid);
 
-    .bp5-tab {
+    .bp6-tab {
       border-radius: 0 !important;
     }
 

package/appcontainer/ThemeModel.ts

@@ -30,7 +30,7 @@ export class ThemeModel extends HoistModel {
     setDarkTheme(value: boolean) {
         const classList = document.body.classList;
         classList.toggle('xh-dark', value);
-        classList.toggle('bp5-dark', value);
+        classList.toggle('bp6-dark', value);
         this.darkTheme = value;
     }
 

package/build/types/desktop/cmp/input/DateInput.d.ts

@@ -1,6 +1,6 @@
 import { PopperBoundary, PopperModifierOverrides } from '@blueprintjs/core';
 import { TimePickerProps } from '@blueprintjs/datetime';
-import { ReactDayPickerSingleProps } from '@blueprintjs/datetime2/src/common/reactDayPickerProps';
+import { ReactDayPickerSingleProps } from '@blueprintjs/datetime/src/common/reactDayPickerProps';
 import { HoistInputProps } from '@xh/hoist/cmp/input';
 import { HoistProps, LayoutProps, Some } from '@xh/hoist/core';
 import '@xh/hoist/desktop/register';

package/build/types/desktop/hooks/UseContextMenu.d.ts

@@ -1,4 +1,4 @@
-import type { ContextMenuSpec } from '@xh/hoist/core';
+import { ContextMenuSpec } from '@xh/hoist/core';
 import { ReactElement } from 'react';
 /**
  * Hook to add a right-click context menu to a component.

package/build/types/kit/blueprint/Wrappers.d.ts

@@ -1,5 +1,5 @@
 import { Alert, Button, ButtonGroup, Callout, Card, Checkbox, ControlGroup, Dialog, Drawer, EditableText, FileInput, FormGroup, Hotkey, Hotkeys, InputGroup, Label, Menu, MenuDivider, MenuItem, Navbar, NavbarDivider, NavbarGroup, NavbarHeading, NumericInput, OverflowList, Overlay2 as Overlay, Popover, Radio, RadioGroup, RangeSlider, Slider, Switch, Tab, Tabs, Tag, TagInput, Text, TextArea, Tooltip, Tree } from '@blueprintjs/core';
-import { DatePicker3 as DatePicker } from '@blueprintjs/datetime2';
+import { DatePicker } from '@blueprintjs/datetime';
 export { Alert, Button, ButtonGroup, Callout, Card, Checkbox, ControlGroup, DatePicker, Dialog, Drawer, EditableText, FileInput, FormGroup, Hotkeys, Hotkey, InputGroup, Label, Menu, MenuItem, MenuDivider, Navbar, NavbarDivider, NavbarGroup, NavbarHeading, NumericInput, OverflowList, Overlay, Popover, Radio, RadioGroup, RangeSlider, Slider, Switch, Tab, Tabs, Tag, TagInput, TextArea, Text, Tooltip, Tree };
-export declare const alert: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").AlertProps>, button: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").ButtonProps>, controlGroup: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").ControlGroupProps>, checkbox: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").CheckboxProps>, dialog: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").DialogProps>, datePicker: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/datetime2").DatePicker3Props>, menuDivider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").MenuDividerProps>, menuItem: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").MenuItemProps>, navbarDivider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").NavbarDividerProps>, numericInput: import("@xh/hoist/core").ElementFactory<Omit<import("@blueprintjs/core").HTMLInputProps, "size"> & import("@blueprintjs/core").NumericInputProps>, overflowList: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").OverflowListProps<any>>, popover: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").PopoverProps<import("@blueprintjs/core").DefaultPopoverTargetHTMLProps>>, radio: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").ControlProps>, rangeSlider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").RangeSliderProps>, slider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").SliderProps>, switchControl: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").SwitchProps>, textArea: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TextAreaProps>, tree: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TreeProps<unknown>>, tagInput: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TagInputProps>, fileInput: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").FileInputProps>, overlay: import("@xh/hoist/core").ElementFactory<Omit<import("@blueprintjs/core").Overlay2Props, "ref"> & import("react").RefAttributes<import("@blueprintjs/core").OverlayInstance>>, tooltip: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TooltipProps<import("@blueprintjs/core").DefaultPopoverTargetHTMLProps>>;
+export declare const alert: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").AlertProps>, button: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").ButtonProps>, controlGroup: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").ControlGroupProps>, checkbox: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").CheckboxProps>, dialog: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").DialogProps>, datePicker: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/datetime").DatePickerProps>, menuDivider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").MenuDividerProps>, menuItem: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").MenuItemProps>, navbarDivider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").NavbarDividerProps>, numericInput: import("@xh/hoist/core").ElementFactory<Omit<import("@blueprintjs/core").HTMLInputProps, "size"> & import("@blueprintjs/core").NumericInputProps>, overflowList: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").OverflowListProps<any>>, popover: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").PopoverProps<import("@blueprintjs/core").DefaultPopoverTargetHTMLProps>>, radio: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").ControlProps>, rangeSlider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").RangeSliderProps>, slider: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").SliderProps>, switchControl: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").SwitchProps>, textArea: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TextAreaProps>, tree: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TreeProps<unknown>>, tagInput: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TagInputProps>, fileInput: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").FileInputProps>, overlay: import("@xh/hoist/core").ElementFactory<Omit<import("@blueprintjs/core").Overlay2Props, "ref"> & import("react").RefAttributes<import("@blueprintjs/core").OverlayInstance>>, tooltip: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TooltipProps<import("@blueprintjs/core").DefaultPopoverTargetHTMLProps>>;
 export declare const buttonGroup: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").ButtonGroupProps>, callout: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").CalloutProps>, card: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").CardProps>, drawer: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").DrawerProps>, editableText: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").EditableTextProps>, formGroup: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").FormGroupProps>, hotkey: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").HotkeyProps>, hotkeys: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").HotkeysProps>, inputGroup: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").InputGroupProps>, label: import("@xh/hoist/core").ElementFactory<import("react").AllHTMLAttributes<HTMLLabelElement> & import("react").RefAttributes<HTMLLabelElement>>, menu: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").MenuProps>, navbar: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").NavbarProps>, navbarHeading: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").NavbarHeadingProps>, navbarGroup: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").NavbarGroupProps>, radioGroup: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").RadioGroupProps>, tabs: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TabsProps>, tab: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TabProps>, tag: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TagProps>, text: import("@xh/hoist/core").ElementFactory<import("@blueprintjs/core").TextProps>;

package/build/types/kit/blueprint/index.d.ts

@@ -1,7 +1,6 @@
 import { Classes, type HotkeyConfig, OverlayToaster, PopoverInteractionKind, Position, type ToasterPosition, useHotkeys } from '@blueprintjs/core';
 import '@blueprintjs/core/lib/css/blueprint.css';
 import '@blueprintjs/datetime/lib/css/blueprint-datetime.css';
-import '@blueprintjs/datetime2/lib/css/blueprint-datetime2.css';
 import './styles.scss';
 export { useHotkeys, HotkeyConfig, Classes, PopoverInteractionKind, Position, OverlayToaster, ToasterPosition };
 export * from './Wrappers';

package/cmp/ag-grid/AgGrid.scss

@@ -446,7 +446,7 @@
   }
 
   // Set Blueprint controls - specifically checkboxes - to match grid size.
-  .bp5-control .bp5-control-indicator {
+  .bp6-control .bp6-control-indicator {
     font-size: 1em;
   }
 }

package/cmp/chart/Chart.scss

@@ -6,7 +6,7 @@
  */
 
 // Allows inside of chart navigator mask to be draggable.
-.bp5-dialog .xh-chart {
+.bp6-dialog .xh-chart {
   pointer-events: auto;
 }
 

package/desktop/appcontainer/ExceptionDialog.scss

@@ -7,7 +7,7 @@
 .xh-exception-dialog {
   max-height: 80vh;
 
-  .bp5-dialog-body {
+  .bp6-dialog-body {
     max-height: inherit;
     overflow-y: auto;
   }

package/desktop/appcontainer/LoginPanel.scss

@@ -9,7 +9,7 @@
   border: var(--xh-border-solid);
   border-radius: var(--xh-border-radius-px);
 
-  .bp5-input-group {
+  .bp6-input-group {
     margin: 0 var(--xh-pad-px) var(--xh-pad-px) var(--xh-pad-px);
   }
 

package/desktop/appcontainer/Message.scss

@@ -11,7 +11,7 @@
 
 .xh-message {
   max-height: 90vh;
-  .bp5-dialog-body {
+  .bp6-dialog-body {
     overflow-y: auto;
   }
 }

package/desktop/appcontainer/Toast.scss

@@ -29,16 +29,16 @@
       margin: 0 0 0 var(--xh-pad-half-px);
     }
 
-    .bp5-toast-message {
+    .bp6-toast-message {
       overflow-wrap: break-word;
     }
 
     // High level of specificity here required to override built-in BP styles
-    &.bp5-toast .bp5-button {
+    &.bp6-toast .bp6-button {
       background: none !important;
       color: white !important;
 
-      .bp5-icon {
+      .bp6-icon {
         color: white !important;
       }
     }

package/desktop/appcontainer/ToastSource.ts

@@ -4,26 +4,14 @@
  *
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
-import {OverlayToasterProps} from '@blueprintjs/core';
 import {ToastModel} from '@xh/hoist/appcontainer/ToastModel';
 import {ToastSourceModel} from '@xh/hoist/appcontainer/ToastSourceModel';
 import {div} from '@xh/hoist/cmp/layout';
-import {
-    elementFactory,
-    hoistCmp,
-    HoistModel,
-    lookup,
-    PlainObject,
-    useLocalModel,
-    uses,
-    XH
-} from '@xh/hoist/core';
+import {hoistCmp, HoistModel, lookup, useLocalModel, uses} from '@xh/hoist/core';
 import {OverlayToaster, ToasterPosition} from '@xh/hoist/kit/blueprint';
 import {getOrCreate} from '@xh/hoist/utils/js';
 import classNames from 'classnames';
 import {isElement, map} from 'lodash';
-import {RefAttributes} from 'react';
-import {createRoot} from 'react-dom/client';
 import {wait} from '../../promise';
 import './Toast.scss';
 
@@ -108,39 +96,8 @@ class ToastSourceLocalModel extends HoistModel {
         const toasterMap = this._toasterMap,
             toasters = getOrCreate(toasterMap, container, () => ({}));
         if (!toasters[position]) {
-            toasters[position] = await this.createToaster({position, className}, container);
+            toasters[position] = await OverlayToaster.create({position, className}, {container});
         }
         return toasters[position];
     }
-
-    /**
-     * Workaround to avoid calling OverlayToaster.create(). It uses ReactDOM.render
-     * that gives a warning because it is deprecated in React 18.
-     *
-     * The use of ReactDOM.render set to be removed from OverlayToaster.create() in Blueprint v6.0
-     * https://github.com/palantir/blueprint/issues/5212#issuecomment-1294958195
-     */
-    private createToaster(props: PlainObject, container: HTMLElement): Promise<OverlayToaster> {
-        const containerElement = document.createElement('div');
-        container.appendChild(containerElement);
-        const root = createRoot(containerElement);
-        return new Promise((resolve, reject) => {
-            root.render(
-                overlayToaster({
-                    ...props,
-                    usePortal: false,
-                    ref: instance => {
-                        instance
-                            ? resolve(instance)
-                            : reject(XH.exception('Unable to create Blueprint toaster.'));
-                    }
-                })
-            );
-        });
-    }
 }
-
-// `OverlayToasterProps` does not include `ref` prop, so we need to add it manually
-const overlayToaster = elementFactory<OverlayToasterProps & RefAttributes<OverlayToaster>>(
-    OverlayToaster
-);

package/desktop/cmp/appbar/AppBar.scss

@@ -25,8 +25,8 @@
 //------------------------
 // Blueprint overrides
 //------------------------
-.bp5-navbar,
-.bp5-dark .bp5-navbar {
+.bp6-navbar,
+.bp6-dark .bp6-navbar {
   display: flex;
   align-items: center;
   flex-wrap: nowrap;
@@ -40,7 +40,7 @@
   // Curiously, Admin Log Viewer would cause appbar to shrink without min-height
   min-height: var(--xh-appbar-height-px);
 
-  .bp5-navbar-divider {
+  .bp6-navbar-divider {
     border-left-color: var(--xh-tbar-separator-color);
   }
 
@@ -49,17 +49,17 @@
     flex-shrink: 0;
   }
 
-  .bp5-navbar-heading {
+  .bp6-navbar-heading {
     color: var(--xh-appbar-title-color);
     font-size: var(--xh-appbar-title-font-size-px);
     margin-left: var(--xh-pad-px);
   }
 
-  .bp5-navbar-group {
+  .bp6-navbar-group {
     overflow: hidden;
     height: var(--xh-appbar-height-px);
 
-    .bp5-navbar-divider {
+    .bp6-navbar-divider {
       margin: 0 var(--xh-pad-px);
     }
 
@@ -70,7 +70,7 @@
       margin: 0 5px 0 0;
     }
 
-    &.bp5-align-left {
+    &.bp6-align-left {
       // Flex simulates left alignment
       flex: 1;
 
@@ -80,13 +80,13 @@
       }
     }
 
-    &.bp5-align-right {
+    &.bp6-align-right {
       // Apply standardized spacing to extra appBar items, excepting dividers and xh-no-pad elements.
-      > *:not(.bp5-navbar-divider):not(.xh-no-pad) {
+      > *:not(.bp6-navbar-divider):not(.xh-no-pad) {
         margin-left: var(--xh-pad-px);
       }
 
-      .bp5-navbar-divider {
+      .bp6-navbar-divider {
         margin-right: 0;
       }
     }

package/desktop/cmp/button/Button.scss

@@ -11,8 +11,8 @@
 //-----------------------------------------------
 .xh-app,
 .xh-app.xh-dark,
-.xh-app.xh-dark.bp5-dark {
-  .xh-button.bp5-button {
+.xh-app.xh-dark.bp6-dark {
+  .xh-button.bp6-button {
     border-radius: var(--xh-button-border-radius-px);
     font-family: var(--xh-button-font-family);
     font-size: var(--xh-button-font-size-px);
@@ -48,7 +48,7 @@
   // Button group (input)
   //------------------------
   .xh-button-group {
-    .xh-button.bp5-button {
+    .xh-button.bp6-button {
       &.xh-button--minimal,
       &.xh-button--outlined {
         // Ensures outlined buttons in button-groups appear seamlessly adjacent to each other in dark mode.
@@ -74,8 +74,8 @@
     }
 
     // Horizontal mode only styles
-    &:not(.bp5-vertical) {
-      .xh-button.bp5-button {
+    &:not(.bp6-vertical) {
+      .xh-button.bp6-button {
         // Standard and outlined have borders - remove standard radius in between adjacent buttons so
         // they seamlessly combine their inner borders.
         border-radius: 0;
@@ -98,8 +98,8 @@
     }
 
     // Vertical mode only styles
-    &.bp5-vertical {
-      .xh-button.bp5-button {
+    &.bp6-vertical {
+      .xh-button.bp6-button {
         // Standard and outlined have borders - remove standard radius in between adjacent buttons so
         // they seamlessly combine their inner borders.
         border-radius: 0;
@@ -127,7 +127,7 @@
 // Default/light theme colors
 //---------------------------
 .xh-app {
-  .xh-button.bp5-button {
+  .xh-button.bp6-button {
     // Shaded/filled-in (non-minimal) mode.
     &.xh-button--standard {
       &.xh-button--active {
@@ -320,8 +320,8 @@
 // Dark theme colors
 //---------------------------
 .xh-app.xh-dark,
-.xh-app.xh-dark.bp5-dark {
-  .xh-button.bp5-button {
+.xh-app.xh-dark.bp6-dark {
+  .xh-button.bp6-button {
     // Dark - shaded/filled-in (non-minimal) mode.
     &.xh-button--standard {
       &.xh-button--intent-none {
@@ -507,7 +507,7 @@
   .xh-panel-header__items,
   .xh-panel-header--right,
   .xh-panel-header--left {
-    .xh-button.bp5-button.xh-button--minimal {
+    .xh-button.bp6-button.xh-button--minimal {
       &.xh-button--intent-none {
         &.xh-button--enabled {
           &:hover:not(:active):not(.xh-button--active) {

package/desktop/cmp/dash/canvas/DashCanvas.scss

@@ -40,7 +40,7 @@
     align-items: center;
     justify-content: center;
 
-    .bp5-overlay-backdrop {
+    .bp6-overlay-backdrop {
       background-color: var(--xh-bg);
     }
   }

package/desktop/cmp/dash/canvas/DashCanvas.ts

@@ -11,7 +11,6 @@ import ReactGridLayout, {
     getCompactor
 } from 'react-grid-layout';
 import {GridBackground, type GridBackgroundProps} from 'react-grid-layout/extras';
-import {showContextMenu} from '@xh/hoist/kit/blueprint';
 import composeRefs from '@seznam/compose-react-refs';
 import {div, vbox, vspacer} from '@xh/hoist/cmp/layout';
 import {
@@ -24,7 +23,7 @@ import {
 } from '@xh/hoist/core';
 import {dashCanvasAddViewButton} from '@xh/hoist/desktop/cmp/button/DashCanvasAddViewButton';
 import '@xh/hoist/desktop/register';
-import {Classes, overlay} from '@xh/hoist/kit/blueprint';
+import {Classes, overlay, showContextMenu} from '@xh/hoist/kit/blueprint';
 import {consumeEvent, mergeDeep, TEST_ID} from '@xh/hoist/utils/js';
 import classNames from 'classnames';
 import {DashCanvasModel} from './DashCanvasModel';

package/desktop/cmp/dash/container/DashContainer.scss

@@ -5,7 +5,7 @@
     align-items: center;
     justify-content: center;
 
-    .bp5-overlay-backdrop {
+    .bp6-overlay-backdrop {
       background-color: var(--xh-bg);
     }
   }

package/desktop/cmp/dash/container/DashContainerModel.ts

@@ -17,7 +17,6 @@ import {
     XH
 } from '@xh/hoist/core';
 import {convertIconToHtml, deserializeIcon, ResolvedIconProps} from '@xh/hoist/icon';
-import {showContextMenu} from '@xh/hoist/kit/blueprint';
 import {GoldenLayout} from '@xh/hoist/kit/golden-layout';
 import {action, bindable, makeObservable, observable, runInAction} from '@xh/hoist/mobx';
 import {wait} from '@xh/hoist/promise';
@@ -48,6 +47,7 @@ import {
     goldenLayoutConfig
 } from './impl/DashContainerUtils';
 import {dashContainerView} from './impl/DashContainerView';
+import {showContextMenu} from '@xh/hoist/kit/blueprint';
 
 export interface DashContainerConfig extends DashConfig<
     DashContainerViewSpec,

package/desktop/cmp/dock/impl/Dock.scss

@@ -86,7 +86,7 @@
     }
 
     // Extra specificity needed here to overcome the specificity in Button.scss.
-    .xh-button.bp5-button {
+    .xh-button.bp6-button {
       &.xh-button--minimal {
         &.xh-button--intent-none {
           &.xh-button--enabled {

package/desktop/cmp/filter/FilterChooser.scss

@@ -6,7 +6,7 @@
  */
 
 .xh-filter-chooser {
-  .bp5-popover-target {
+  .bp6-popover-target {
     display: flex;
     flex: 1;
   }

package/desktop/cmp/filter/PopoverFilterChooser.scss

@@ -5,17 +5,17 @@
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
 .xh-popover-filter-chooser {
-  & > .bp5-popover-target {
+  & > .bp6-popover-target {
     display: flex;
     flex: 1;
   }
 
   // Extra class names required to override the default styles of the popover
-  &__popover.bp5-popover.bp5-minimal {
+  &__popover.bp6-popover.bp6-minimal {
     margin-top: -15px !important;
     box-shadow: none;
 
-    .bp5-popover-content {
+    .bp6-popover-content {
       background: transparent;
     }
 

package/desktop/cmp/form/FormField.scss

@@ -29,18 +29,18 @@
       align-items: stretch;
 
       .xh-input {
-        .bp5-input-group {
+        .bp6-input-group {
           width: 100%;
         }
 
-        &.bp5-popover-target,
-        .bp5-popover-target {
+        &.bp6-popover-target,
+        .bp6-popover-target {
           display: flex;
           flex: 1;
         }
       }
 
-      .bp5-popover-target > .bp5-control-group {
+      .bp6-popover-target > .bp6-control-group {
         display: flex;
         flex: 1;
       }

package/desktop/cmp/grid/columns/Actions.ts

@@ -69,7 +69,7 @@ export const actionCol: ColumnSpec = {
                 disabled,
                 tooltip,
                 intent,
-                className: classNames('bp5-small', 'xh-record-action-button', className),
+                className: classNames('bp6-small', 'xh-record-action-button', className),
                 onClick: ev => {
                     ev.stopPropagation();
                     action.call({record, selectedRecords: [record], gridModel, column});

package/desktop/cmp/grid/editors/Editors.scss

@@ -21,7 +21,7 @@
     }
 
     .xh-date-input__wrapper,
-    .bp5-popover-target > div {
+    .bp6-popover-target > div {
       display: flex;
       flex: 1;
       height: 100%;
@@ -32,13 +32,13 @@
       width: 100%;
       height: 100%;
 
-      .bp5-input-group {
+      .bp6-input-group {
         display: flex;
         flex: 1;
         height: 100%;
         width: 100%;
 
-        .bp5-input-action {
+        .bp6-input-action {
           button {
             min-height: 18px;
 
@@ -79,7 +79,7 @@
         justify-content: center;
         padding: 0;
 
-        .bp5-control-indicator {
+        .bp6-control-indicator {
           margin: 0;
         }
       }

package/desktop/cmp/grid/find/GridFindField.scss

@@ -6,7 +6,7 @@
  */
 
 .xh-grid-find-field {
-  .bp5-input {
+  .bp6-input {
     border-radius: 3px 0 0 3px;
   }
 

package/desktop/cmp/grid/impl/filter/headerfilter/custom/CustomTab.scss

@@ -28,8 +28,8 @@
     &__bottom {
       margin-top: var(--xh-pad-half-px);
 
-      .bp5-popover-target,
-      .bp5-input-group {
+      .bp6-popover-target,
+      .bp6-input-group {
         width: 100%;
       }
     }

package/desktop/cmp/grid/impl/filter/headerfilter/values/ValuesTab.scss

@@ -4,7 +4,7 @@
     padding: 5px 7px;
     row-gap: 5px;
 
-    .bp5-control-indicator {
+    .bp6-control-indicator {
       font-size: 1em;
     }
 
@@ -54,7 +54,7 @@
 
   .ag-pinned-left-header,
   .ag-cell.ag-cell-last-left-pinned {
-    .bp5-control.bp5-inline {
+    .bp6-control.bp6-inline {
       margin-right: -8px;
 
       input {

package/desktop/cmp/grouping/GroupingChooser.scss

@@ -25,12 +25,12 @@
   }
 
   // Outer box is sized via layoutSupport - all nested inner elements should stretch to fill.
-  .bp5-popover-target,
+  .bp6-popover-target,
   .xh-grouping-chooser-button {
     width: 100%;
   }
 
-  .bp5-popover-target span {
+  .bp6-popover-target span {
     position: relative;
   }
 
@@ -148,7 +148,7 @@
 
     --xh-menu-border: none;
 
-    .bp5-menu {
+    .bp6-menu {
       padding: 0;
     }
 

package/desktop/cmp/input/Checkbox.scss

@@ -5,7 +5,7 @@
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
 
-.xh-check-box.xh-input-disabled input:checked ~ .bp5-control-indicator {
+.xh-check-box.xh-input-disabled input:checked ~ .bp6-control-indicator {
   background-color: var(--xh-input-disabled-bg) !important;
   &::before {
     background-image: var(--xh-input-disabled-checkmark-svg) !important;

package/desktop/cmp/input/DateInput.scss

@@ -6,11 +6,11 @@
  */
 
 .xh-date-input__wrapper {
-  .bp5-input-action {
+  .bp6-input-action {
     height: 100%;
   }
 
-  .bp5-input-group .xh-icon {
+  .bp6-input-group .xh-icon {
     position: relative;
     margin: 0 !important;
   }
@@ -24,7 +24,7 @@
         cursor: pointer !important;
       }
 
-      .bp5-input-group.bp5-disabled {
+      .bp6-input-group.bp6-disabled {
         cursor: pointer !important;
       }
     }

package/desktop/cmp/input/DateInput.ts

@@ -6,7 +6,7 @@
  */
 import {PopperBoundary, PopperModifierOverrides} from '@blueprintjs/core';
 import {TimePickerProps} from '@blueprintjs/datetime';
-import {ReactDayPickerSingleProps} from '@blueprintjs/datetime2/src/common/reactDayPickerProps';
+import {ReactDayPickerSingleProps} from '@blueprintjs/datetime/src/common/reactDayPickerProps';
 import {HoistInputModel, HoistInputProps, useHoistInputModel} from '@xh/hoist/cmp/input';
 import {div, hbox} from '@xh/hoist/cmp/layout';
 import {hoistCmp, HoistProps, LayoutProps, Some} from '@xh/hoist/core';