Merge remote-tracking branch 'origin/devel' into dbeaver/pro#5574/fix/multi-query-vqb

Author: Wroud

common-react/@dbeaver/react-data-grid/src/renderers/OrderButton.tsx

@@ -1,4 +1,4 @@
-import { clsx, IconButton } from '@dbeaver/ui-kit';
+import { clsx, IconButton, Icon } from '@dbeaver/ui-kit';
 
 interface OrderButtonProps {
   colIdx: number;
@@ -14,9 +14,9 @@ export function OrderButton({ colIdx, sortState, onSort, tabIndex, ref }: OrderB
     onSort(colIdx, nextSortState, e.ctrlKey || e.metaKey);
   }
 
-  const svgSortAsc = '#icon-sort-asc';
-  const svgSortDesc = '#icon-sort-desc';
-  const svgSortUnknown = '#icon-sort-unknown';
+  const svgSortAsc = 'sort-asc';
+  const svgSortDesc = 'sort-desc';
+  const svgSortUnknown = 'sort-unknown';
 
   const iconSrc = sortState === 'asc' ? svgSortAsc : sortState === 'desc' ? svgSortDesc : svgSortUnknown;
 
@@ -34,9 +34,7 @@ export function OrderButton({ colIdx, sortState, onSort, tabIndex, ref }: OrderB
         sortState && 'tw:opacity-100',
       )}
     >
-      <svg width="16" height="16" viewBox="0 0 16 16">
-        <use href={iconSrc} />
-      </svg>
+      <Icon name={iconSrc} />
     </IconButton>
   );
 }

common-react/@dbeaver/ui-kit/.ladle/components.tsx

@@ -1,2 +1,14 @@
 import '../src/index.css';
 import './global.css';
+import Icons from '../assets/icons/icons.svg?react';
+
+import type { GlobalProvider } from '@ladle/react';
+
+export const Provider: GlobalProvider = ({ children }) => {
+  return (
+    <div>
+      <Icons style={{ display: 'none' }} />
+      {children}
+    </div>
+  );
+};