Merge branch 'master' into zsviczian-loop-lock

# Conflicts:
#	packages/element/src/linearElementEditor.ts
#	packages/excalidraw/actions/actionFinalize.tsx
#	packages/excalidraw/actions/actionLinearEditor.tsx

README.md

@@ -63,7 +63,7 @@ The Excalidraw editor (npm package) supports:
 - 🏗️ Customizable.
 - 📷 Image support.
 - 😀 Shape libraries support.
-- 👅 Localization (i18n) support.
+- 🌐 Localization (i18n) support.
 - 🖼️ Export to PNG, SVG & clipboard.
 - 💾 Open format - export drawings as an `.excalidraw` json file.
 - ⚒️ Wide range of tools - rectangle, circle, diamond, arrow, line, free-draw, eraser...

excalidraw-app/App.tsx

@@ -47,10 +47,10 @@ import {
   share,
   youtubeIcon,
 } from "@excalidraw/excalidraw/components/icons";
-import { isElementLink } from "@excalidraw/element/elementLink";
+import { isElementLink } from "@excalidraw/element";
 import { restore, restoreAppState } from "@excalidraw/excalidraw/data/restore";
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
-import { isInitializedImageElement } from "@excalidraw/element/typeChecks";
+import { isInitializedImageElement } from "@excalidraw/element";
 import clsx from "clsx";
 import {
   parseLibraryTokensFromUrl,

excalidraw-app/collab/Collab.tsx

@@ -19,12 +19,9 @@ import {
   throttleRAF,
 } from "@excalidraw/common";
 import { decryptData } from "@excalidraw/excalidraw/data/encryption";
-import { getVisibleSceneBounds } from "@excalidraw/element/bounds";
+import { getVisibleSceneBounds } from "@excalidraw/element";
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
-import {
+import { isImageElement, isInitializedImageElement } from "@excalidraw/element";
-  isImageElement,
-  isInitializedImageElement,
-} from "@excalidraw/element/typeChecks";
 import { AbortError } from "@excalidraw/excalidraw/errors";
 import { t } from "@excalidraw/excalidraw/i18n";
 import { withBatchedUpdates } from "@excalidraw/excalidraw/reactUtils";

excalidraw-app/collab/Portal.tsx

@@ -1,7 +1,7 @@
 import { CaptureUpdateAction } from "@excalidraw/excalidraw";
 import { trackEvent } from "@excalidraw/excalidraw/analytics";
 import { encryptData } from "@excalidraw/excalidraw/data/encryption";
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
 import throttle from "lodash.throttle";
 
 import type { UserIdleState } from "@excalidraw/common";

excalidraw-app/components/ExportToExcalidrawPlus.tsx

@@ -12,7 +12,7 @@ import {
   generateEncryptionKey,
 } from "@excalidraw/excalidraw/data/encryption";
 import { serializeAsJSON } from "@excalidraw/excalidraw/data/json";
-import { isInitializedImageElement } from "@excalidraw/element/typeChecks";
+import { isInitializedImageElement } from "@excalidraw/element";
 import { useI18n } from "@excalidraw/excalidraw/i18n";
 
 import type {

excalidraw-app/data/FileManager.ts

@@ -1,7 +1,7 @@
 import { CaptureUpdateAction } from "@excalidraw/excalidraw";
 import { compressData } from "@excalidraw/excalidraw/data/encode";
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
-import { isInitializedImageElement } from "@excalidraw/element/typeChecks";
+import { isInitializedImageElement } from "@excalidraw/element";
 import { t } from "@excalidraw/excalidraw/i18n";
 
 import type {

excalidraw-app/data/index.ts

@@ -9,14 +9,14 @@ import {
 } from "@excalidraw/excalidraw/data/encryption";
 import { serializeAsJSON } from "@excalidraw/excalidraw/data/json";
 import { restore } from "@excalidraw/excalidraw/data/restore";
-import { isInvisiblySmallElement } from "@excalidraw/element/sizeHelpers";
+import { isInvisiblySmallElement } from "@excalidraw/element";
-import { isInitializedImageElement } from "@excalidraw/element/typeChecks";
+import { isInitializedImageElement } from "@excalidraw/element";
 import { t } from "@excalidraw/excalidraw/i18n";
 import { bytesToHexString } from "@excalidraw/common";
 
 import type { UserIdleState } from "@excalidraw/common";
 import type { ImportedDataState } from "@excalidraw/excalidraw/data/types";
-import type { SceneBounds } from "@excalidraw/element/bounds";
+import type { SceneBounds } from "@excalidraw/element";
 import type {
   ExcalidrawElement,
   FileId,

excalidraw-app/tests/collab.test.tsx

@@ -3,17 +3,14 @@ import {
   createRedoAction,
   createUndoAction,
 } from "@excalidraw/excalidraw/actions/actionHistory";
-import { syncInvalidIndices } from "@excalidraw/element/fractionalIndex";
+import { syncInvalidIndices } from "@excalidraw/element";
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 import { act, render, waitFor } from "@excalidraw/excalidraw/tests/test-utils";
 import { vi } from "vitest";
 
-import { StoreIncrement } from "@excalidraw/element/store";
+import { StoreIncrement } from "@excalidraw/element";
 
-import type {
+import type { DurableIncrement, EphemeralIncrement } from "@excalidraw/element";
-  DurableIncrement,
-  EphemeralIncrement,
-} from "@excalidraw/element/store";
 
 import ExcalidrawApp from "../App";
 

packages/common/src/constants.ts

@@ -143,6 +143,7 @@ export const FONT_FAMILY = {
   "Lilita One": 7,
   "Comic Shanns": 8,
   "Liberation Sans": 9,
+  Assistant: 10,
 };
 
 export const FONT_FAMILY_FALLBACKS = {

packages/common/src/font-metadata.ts

@@ -22,8 +22,10 @@ export interface FontMetadata {
   };
   /** flag to indicate a deprecated font */
   deprecated?: true;
-  /** flag to indicate a server-side only font */
+  /**
-  serverSide?: true;
+   * whether this is a font that users can use (= shown in font picker)
+   */
+  private?: true;
   /** flag to indiccate a local-only font */
   local?: true;
   /** flag to indicate a fallback font */
@@ -98,7 +100,16 @@ export const FONT_METADATA: Record<number, FontMetadata> = {
       descender: -434,
       lineHeight: 1.15,
     },
-    serverSide: true,
+    private: true,
+  },
+  [FONT_FAMILY.Assistant]: {
+    metrics: {
+      unitsPerEm: 2048,
+      ascender: 1021,
+      descender: -287,
+      lineHeight: 1.25,
+    },
+    private: true,
   },
   [FONT_FAMILY_FALLBACKS.Xiaolai]: {
     metrics: {

packages/element/src/Scene.ts

@@ -9,21 +9,18 @@ import {
   toArray,
 } from "@excalidraw/common";
 import { isNonDeletedElement } from "@excalidraw/element";
-import { isFrameLikeElement } from "@excalidraw/element/typeChecks";
+import { isFrameLikeElement } from "@excalidraw/element";
-import { getElementsInGroup } from "@excalidraw/element/groups";
+import { getElementsInGroup } from "@excalidraw/element";
 
 import {
   syncInvalidIndices,
   syncMovedIndices,
   validateFractionalIndices,
-} from "@excalidraw/element/fractionalIndex";
+} from "@excalidraw/element";
 
-import { getSelectedElements } from "@excalidraw/element/selection";
+import { getSelectedElements } from "@excalidraw/element";
 
-import {
+import { mutateElement, type ElementUpdate } from "@excalidraw/element";
-  mutateElement,
-  type ElementUpdate,
-} from "@excalidraw/element/mutateElement";
 
 import type {
   ExcalidrawElement,
@@ -108,7 +105,7 @@ const hashSelectionOpts = (
 // in our codebase
 export type ExcalidrawElementsIncludingDeleted = readonly ExcalidrawElement[];
 
-class Scene {
+export class Scene {
   // ---------------------------------------------------------------------------
   // instance methods/props
   // ---------------------------------------------------------------------------
@@ -457,5 +454,3 @@ class Scene {
     return element;
   }
 }
-
-export default Scene;

packages/element/src/align.ts

@@ -2,7 +2,7 @@ import { updateBoundElements } from "./binding";
 import { getCommonBoundingBox } from "./bounds";
 import { getMaximumGroups } from "./groups";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 import type { BoundingBox } from "./bounds";
 import type { ExcalidrawElement } from "./types";

packages/element/src/binding.ts

@@ -66,7 +66,7 @@ import {
 import { aabbForElement, getElementShape, pointInsideBounds } from "./shapes";
 import { updateElbowArrowPoints } from "./elbowArrow";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 import type { Bounds } from "./bounds";
 import type { ElementUpdate } from "./mutateElement";

packages/element/src/delta.ts

@@ -49,7 +49,7 @@ import { getNonDeletedGroupIds } from "./groups";
 
 import { orderByFractionalIndex, syncMovedIndices } from "./fractionalIndex";
 
-import Scene from "./Scene";
+import { Scene } from "./Scene";
 
 import type { BindableProp, BindingProp } from "./binding";
 

packages/element/src/dragElements.ts

@@ -26,7 +26,7 @@ import {
   isTextElement,
 } from "./typeChecks";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 import type { Bounds } from "./bounds";
 import type { ExcalidrawElement } from "./types";

packages/element/src/flowchart.ts

@@ -39,7 +39,7 @@ import {
   type OrderedExcalidrawElement,
 } from "./types";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 type LinkDirection = "up" | "right" | "down" | "left";
 

packages/element/src/frame.ts

@@ -905,13 +905,16 @@ export const shouldApplyFrameClip = (
   return false;
 };
 
-export const getFrameLikeTitle = (element: ExcalidrawFrameLikeElement) => {
+const DEFAULT_FRAME_NAME = "Frame";
+const DEFAULT_AI_FRAME_NAME = "AI Frame";
+
+export const getDefaultFrameName = (element: ExcalidrawFrameLikeElement) => {
   // TODO name frames "AI" only if specific to AI frames
-  return element.name === null
+  return isFrameElement(element) ? DEFAULT_FRAME_NAME : DEFAULT_AI_FRAME_NAME;
-    ? isFrameElement(element)
+};
-      ? "Frame"
+
-      : "AI Frame"
+export const getFrameLikeTitle = (element: ExcalidrawFrameLikeElement) => {
-    : element.name;
+  return element.name === null ? getDefaultFrameName(element) : element.name;
 };
 
 export const getElementsOverlappingFrame = (

packages/element/src/index.ts

@@ -72,3 +72,47 @@ export const clearElementsForExport = (
 export const clearElementsForLocalStorage = (
   elements: readonly ExcalidrawElement[],
 ) => _clearElements(elements);
+
+export * from "./align";
+export * from "./binding";
+export * from "./bounds";
+export * from "./collision";
+export * from "./comparisons";
+export * from "./containerCache";
+export * from "./cropElement";
+export * from "./delta";
+export * from "./distance";
+export * from "./distribute";
+export * from "./dragElements";
+export * from "./duplicate";
+export * from "./elbowArrow";
+export * from "./elementLink";
+export * from "./embeddable";
+export * from "./flowchart";
+export * from "./fractionalIndex";
+export * from "./frame";
+export * from "./groups";
+export * from "./heading";
+export * from "./image";
+export * from "./linearElementEditor";
+export * from "./mutateElement";
+export * from "./newElement";
+export * from "./renderElement";
+export * from "./resizeElements";
+export * from "./resizeTest";
+export * from "./Scene";
+export * from "./selection";
+export * from "./Shape";
+export * from "./ShapeCache";
+export * from "./shapes";
+export * from "./showSelectedShapeActions";
+export * from "./sizeHelpers";
+export * from "./sortElements";
+export * from "./store";
+export * from "./textElement";
+export * from "./textMeasurements";
+export * from "./textWrapping";
+export * from "./transformHandles";
+export * from "./typeChecks";
+export * from "./utils";
+export * from "./zindex";

packages/element/src/linearElementEditor.ts

@@ -20,7 +20,7 @@ import {
   tupleToCoors,
 } from "@excalidraw/common";
 
-import type { Store } from "@excalidraw/element/store";
+import type { Store } from "@excalidraw/element";
 
 import type { Radians } from "@excalidraw/math";
 
@@ -70,7 +70,7 @@ import { getLockedLinearCursorAlignSize } from "./sizeHelpers";
 
 import { isLineElement } from "./typeChecks";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 import type { Bounds } from "./bounds";
 import type {

packages/element/src/resizeElements.ts

@@ -57,7 +57,7 @@ import {
 
 import { isInGroup } from "./groups";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 import type { BoundingBox } from "./bounds";
 import type {

packages/element/src/textElement.ts

@@ -30,7 +30,7 @@ import {
   isTextElement,
 } from "./typeChecks";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 import type { MaybeTransformHandleType } from "./transformHandles";
 import type {

packages/element/src/zindex.ts

@@ -10,7 +10,7 @@ import { syncMovedIndices } from "./fractionalIndex";
 
 import { getSelectedElements } from "./selection";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 import type { ExcalidrawElement, ExcalidrawFrameLikeElement } from "./types";
 

packages/element/tests/cropElement.test.tsx

@@ -3,21 +3,30 @@ import { vi } from "vitest";
 
 import { KEYS, cloneJSON } from "@excalidraw/common";
 
-import { duplicateElement } from "@excalidraw/element/duplicate";
+import {
+  Excalidraw,
+  exportToCanvas,
+  exportToSvg,
+} from "@excalidraw/excalidraw";
+import {
+  actionFlipHorizontal,
+  actionFlipVertical,
+} from "@excalidraw/excalidraw/actions";
 
-import type {
+import { API } from "@excalidraw/excalidraw/tests/helpers/api";
-  ExcalidrawImageElement,
+import { Keyboard, Pointer, UI } from "@excalidraw/excalidraw/tests/helpers/ui";
-  ImageCrop,
+import {
-} from "@excalidraw/element/types";
+  act,
+  GlobalTestState,
+  render,
+  unmountComponent,
+} from "@excalidraw/excalidraw/tests/test-utils";
 
-import { Excalidraw, exportToCanvas, exportToSvg } from "..";
+import type { NormalizedZoomValue } from "@excalidraw/excalidraw/types";
-import { actionFlipHorizontal, actionFlipVertical } from "../actions";
 
-import { API } from "./helpers/api";
+import { duplicateElement } from "../src/duplicate";
-import { Keyboard, Pointer, UI } from "./helpers/ui";
-import { act, GlobalTestState, render, unmountComponent } from "./test-utils";
 
-import type { NormalizedZoomValue } from "../types";
+import type { ExcalidrawImageElement, ImageCrop } from "../src/types";
 
 const { h } = window;
 const mouse = new Pointer("mouse");

packages/element/tests/delta.test.tsx

@@ -1,5 +1,5 @@
 import type { ObservedAppState } from "@excalidraw/excalidraw/types";
-import type { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import type { LinearElementEditor } from "@excalidraw/element";
 
 import { AppStateDelta } from "../src/delta";
 

packages/element/tests/elbowArrow.test.tsx

@@ -22,7 +22,7 @@ import type { LocalPoint } from "@excalidraw/math";
 
 import { bindLinearElement } from "../src/binding";
 
-import Scene from "../src/Scene";
+import { Scene } from "../src/Scene";
 
 import type {
   ExcalidrawArrowElement,

packages/element/tests/fractionalIndex.test.ts

@@ -7,9 +7,9 @@ import {
   syncInvalidIndices,
   syncMovedIndices,
   validateFractionalIndices,
-} from "@excalidraw/element/fractionalIndex";
+} from "@excalidraw/element";
 
-import { deepCopyElement } from "@excalidraw/element/duplicate";
+import { deepCopyElement } from "@excalidraw/element";
 
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 

packages/element/tests/linearElementEditor.test.tsx

@@ -1,5 +1,3 @@
-import { newArrowElement } from "@excalidraw/element/newElement";
-
 import { pointCenter, pointFrom } from "@excalidraw/math";
 import { act, queryByTestId, queryByText } from "@testing-library/react";
 import React from "react";
@@ -13,36 +11,34 @@ import {
   arrayToMap,
 } from "@excalidraw/common";
 
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { Excalidraw } from "@excalidraw/excalidraw";
-import {
+import * as InteractiveCanvas from "@excalidraw/excalidraw/renderer/interactiveScene";
-  getBoundTextElementPosition,
+import * as StaticScene from "@excalidraw/excalidraw/renderer/staticScene";
-  getBoundTextMaxWidth,
+import { API } from "@excalidraw/excalidraw/tests/helpers/api";
-} from "@excalidraw/element/textElement";
-import * as textElementUtils from "@excalidraw/element/textElement";
-import { wrapText } from "@excalidraw/element/textWrapping";
 
-import type { GlobalPoint, LocalPoint } from "@excalidraw/math";
+import { Keyboard, Pointer, UI } from "@excalidraw/excalidraw/tests/helpers/ui";
-
-import type {
-  ExcalidrawElement,
-  ExcalidrawLinearElement,
-  ExcalidrawTextElementWithContainer,
-  FontString,
-} from "@excalidraw/element/types";
-
-import { Excalidraw } from "../index";
-import * as InteractiveCanvas from "../renderer/interactiveScene";
-import * as StaticScene from "../renderer/staticScene";
-import { API } from "../tests/helpers/api";
-
-import { Keyboard, Pointer, UI } from "./helpers/ui";
 import {
   screen,
   render,
   fireEvent,
   GlobalTestState,
   unmountComponent,
-} from "./test-utils";
+} from "@excalidraw/excalidraw/tests/test-utils";
+
+import type { GlobalPoint, LocalPoint } from "@excalidraw/math";
+
+import { wrapText } from "../src";
+import * as textElementUtils from "../src/textElement";
+import { getBoundTextElementPosition, getBoundTextMaxWidth } from "../src";
+import { LinearElementEditor } from "../src";
+import { newArrowElement } from "../src";
+
+import type {
+  ExcalidrawElement,
+  ExcalidrawLinearElement,
+  ExcalidrawTextElementWithContainer,
+  FontString,
+} from "../src/types";
 
 const renderInteractiveScene = vi.spyOn(
   InteractiveCanvas,

packages/element/tests/sortElements.test.ts

@@ -1,6 +1,6 @@
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 
-import { mutateElement } from "@excalidraw/element/mutateElement";
+import { mutateElement } from "@excalidraw/element";
 
 import { normalizeElementOrder } from "../src/sortElements";
 

packages/excalidraw/actions/actionAddToLibrary.ts

@@ -1,7 +1,7 @@
 import { LIBRARY_DISABLED_TYPES, randomId } from "@excalidraw/common";
-import { deepCopyElement } from "@excalidraw/element/duplicate";
+import { deepCopyElement } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { t } from "../i18n";
 

packages/excalidraw/actions/actionAlign.tsx

@@ -1,18 +1,18 @@
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { isFrameLikeElement } from "@excalidraw/element/typeChecks";
+import { isFrameLikeElement } from "@excalidraw/element";
 
-import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element/frame";
+import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element";
 
 import { KEYS, arrayToMap, getShortcutKey } from "@excalidraw/common";
 
-import { alignElements } from "@excalidraw/element/align";
+import { alignElements } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
-import type { Alignment } from "@excalidraw/element/align";
+import type { Alignment } from "@excalidraw/element";
 
 import { ToolButton } from "../components/ToolButton";
 import {

packages/excalidraw/actions/actionBoundText.tsx

@@ -10,14 +10,14 @@ import {
   getOriginalContainerHeightFromCache,
   resetOriginalContainerCache,
   updateOriginalContainerCache,
-} from "@excalidraw/element/containerCache";
+} from "@excalidraw/element";
 
 import {
   computeBoundTextPosition,
   computeContainerDimensionForBoundText,
   getBoundTextElement,
   redrawTextBoundingBox,
-} from "@excalidraw/element/textElement";
+} from "@excalidraw/element";
 
 import {
   hasBoundTextElement,
@@ -25,15 +25,15 @@ import {
   isTextBindableContainer,
   isTextElement,
   isUsingAdaptiveRadius,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
 
-import { measureText } from "@excalidraw/element/textMeasurements";
+import { measureText } from "@excalidraw/element";
 
-import { syncMovedIndices } from "@excalidraw/element/fractionalIndex";
+import { syncMovedIndices } from "@excalidraw/element";
 
-import { newElement } from "@excalidraw/element/newElement";
+import { newElement } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type {
   ExcalidrawElement,

packages/excalidraw/actions/actionCanvas.tsx

@@ -14,10 +14,10 @@ import {
 } from "@excalidraw/common";
 
 import { getNonDeletedElements } from "@excalidraw/element";
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
-import { getCommonBounds, type SceneBounds } from "@excalidraw/element/bounds";
+import { getCommonBounds, type SceneBounds } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 

packages/excalidraw/actions/actionClipboard.tsx

@@ -1,9 +1,9 @@
-import { isTextElement } from "@excalidraw/element/typeChecks";
+import { isTextElement } from "@excalidraw/element";
-import { getTextFromElements } from "@excalidraw/element/textElement";
+import { getTextFromElements } from "@excalidraw/element";
 
 import { CODES, KEYS, isFirefox } from "@excalidraw/common";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import {
   copyTextToSystemClipboard,

packages/excalidraw/actions/actionCropEditor.tsx

@@ -1,6 +1,6 @@
-import { isImageElement } from "@excalidraw/element/typeChecks";
+import { isImageElement } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawImageElement } from "@excalidraw/element/types";
 

packages/excalidraw/actions/actionDeleteSelected.tsx

@@ -1,23 +1,23 @@
 import { KEYS, updateActiveTool } from "@excalidraw/common";
 
 import { getNonDeletedElements } from "@excalidraw/element";
-import { fixBindingsAfterDeletion } from "@excalidraw/element/binding";
+import { fixBindingsAfterDeletion } from "@excalidraw/element";
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { LinearElementEditor } from "@excalidraw/element";
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
-import { getContainerElement } from "@excalidraw/element/textElement";
+import { getContainerElement } from "@excalidraw/element";
 import {
   isBoundToContainer,
   isElbowArrow,
   isFrameLikeElement,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
-import { getFrameChildren } from "@excalidraw/element/frame";
+import { getFrameChildren } from "@excalidraw/element";
 
 import {
   getElementsInGroup,
   selectGroupsForSelectedElements,
-} from "@excalidraw/element/groups";
+} from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 

packages/excalidraw/actions/actionDistribute.tsx

@@ -1,18 +1,18 @@
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { isFrameLikeElement } from "@excalidraw/element/typeChecks";
+import { isFrameLikeElement } from "@excalidraw/element";
 
 import { CODES, KEYS, arrayToMap, getShortcutKey } from "@excalidraw/common";
 
-import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element/frame";
+import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element";
 
-import { distributeElements } from "@excalidraw/element/distribute";
+import { distributeElements } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
-import type { Distribution } from "@excalidraw/element/distribute";
+import type { Distribution } from "@excalidraw/element";
 
 import { ToolButton } from "../components/ToolButton";
 import {

packages/excalidraw/actions/actionDuplicateSelection.tsx

@@ -7,18 +7,18 @@ import {
 
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { LinearElementEditor } from "@excalidraw/element";
 
 import {
   getSelectedElements,
   getSelectionStateForElements,
-} from "@excalidraw/element/selection";
+} from "@excalidraw/element";
 
-import { syncMovedIndices } from "@excalidraw/element/fractionalIndex";
+import { syncMovedIndices } from "@excalidraw/element";
 
-import { duplicateElements } from "@excalidraw/element/duplicate";
+import { duplicateElements } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { ToolButton } from "../components/ToolButton";
 import { DuplicateIcon } from "../components/icons";

packages/excalidraw/actions/actionElementLink.ts

@@ -2,9 +2,9 @@ import {
   canCreateLinkFromElements,
   defaultGetElementLinkFromSelection,
   getLinkIdAndTypeFromSelection,
-} from "@excalidraw/element/elementLink";
+} from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { copyTextToSystemClipboard } from "../clipboard";
 import { copyIcon, elementLinkIcon } from "../components/icons";

packages/excalidraw/actions/actionElementLock.ts

@@ -1,10 +1,10 @@
 import { KEYS, arrayToMap } from "@excalidraw/common";
 
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
 
-import { isFrameLikeElement } from "@excalidraw/element/typeChecks";
+import { isFrameLikeElement } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 

packages/excalidraw/actions/actionEmbeddable.ts

@@ -1,6 +1,6 @@
 import { updateActiveTool } from "@excalidraw/common";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { setCursorForShape } from "../cursor";
 

packages/excalidraw/actions/actionExport.tsx

@@ -7,7 +7,7 @@ import {
 
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { Theme } from "@excalidraw/element/types";
 

packages/excalidraw/actions/actionFinalize.tsx

@@ -3,22 +3,22 @@ import { pointFrom } from "@excalidraw/math";
 import {
   maybeBindLinearElement,
   bindOrUnbindLinearElement,
-} from "@excalidraw/element/binding";
+} from "@excalidraw/element";
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { LinearElementEditor } from "@excalidraw/element";
 
 import {
   isBindingElement,
   isFreeDrawElement,
   isLinearElement,
   isLineElement,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
 
 import { KEYS, arrayToMap, updateActiveTool } from "@excalidraw/common";
-import { isPathALoop } from "@excalidraw/element/shapes";
+import { isPathALoop } from "@excalidraw/element";
 
-import { isInvisiblySmallElement } from "@excalidraw/element/sizeHelpers";
+import { isInvisiblySmallElement } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { LocalPoint } from "@excalidraw/math";
 

packages/excalidraw/actions/actionFlip.ts

@@ -2,20 +2,20 @@ import { getNonDeletedElements } from "@excalidraw/element";
 import {
   bindOrUnbindLinearElements,
   isBindingEnabled,
-} from "@excalidraw/element/binding";
+} from "@excalidraw/element";
-import { getCommonBoundingBox } from "@excalidraw/element/bounds";
+import { getCommonBoundingBox } from "@excalidraw/element";
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
-import { deepCopyElement } from "@excalidraw/element/duplicate";
+import { deepCopyElement } from "@excalidraw/element";
-import { resizeMultipleElements } from "@excalidraw/element/resizeElements";
+import { resizeMultipleElements } from "@excalidraw/element";
 import {
   isArrowElement,
   isElbowArrow,
   isLinearElement,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
-import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element/frame";
+import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element";
 import { CODES, KEYS, arrayToMap } from "@excalidraw/common";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type {
   ExcalidrawArrowElement,

packages/excalidraw/actions/actionFrame.ts

@@ -1,20 +1,20 @@
 import { getNonDeletedElements } from "@excalidraw/element";
-import { mutateElement } from "@excalidraw/element/mutateElement";
+import { mutateElement } from "@excalidraw/element";
-import { newFrameElement } from "@excalidraw/element/newElement";
+import { newFrameElement } from "@excalidraw/element";
-import { isFrameLikeElement } from "@excalidraw/element/typeChecks";
+import { isFrameLikeElement } from "@excalidraw/element";
 import {
   addElementsToFrame,
   removeAllElementsFromFrame,
-} from "@excalidraw/element/frame";
+} from "@excalidraw/element";
-import { getFrameChildren } from "@excalidraw/element/frame";
+import { getFrameChildren } from "@excalidraw/element";
 
 import { KEYS, updateActiveTool } from "@excalidraw/common";
 
-import { getElementsInGroup } from "@excalidraw/element/groups";
+import { getElementsInGroup } from "@excalidraw/element";
 
-import { getCommonBounds } from "@excalidraw/element/bounds";
+import { getCommonBounds } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 

packages/excalidraw/actions/actionGroup.tsx

@@ -1,8 +1,8 @@
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
 
-import { isBoundToContainer } from "@excalidraw/element/typeChecks";
+import { isBoundToContainer } from "@excalidraw/element";
 
 import {
   frameAndChildrenSelectedTogether,
@@ -12,7 +12,7 @@ import {
   groupByFrameLikes,
   removeElementsFromFrame,
   replaceAllElementsInFrame,
-} from "@excalidraw/element/frame";
+} from "@excalidraw/element";
 
 import { KEYS, randomId, arrayToMap, getShortcutKey } from "@excalidraw/common";
 
@@ -24,11 +24,11 @@ import {
   addToGroup,
   removeFromSelectedGroups,
   isElementInGroup,
-} from "@excalidraw/element/groups";
+} from "@excalidraw/element";
 
-import { syncMovedIndices } from "@excalidraw/element/fractionalIndex";
+import { syncMovedIndices } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type {
   ExcalidrawElement,

packages/excalidraw/actions/actionHistory.tsx

@@ -1,8 +1,8 @@
 import { isWindows, KEYS, matchKey, arrayToMap } from "@excalidraw/common";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
-import { orderByFractionalIndex } from "@excalidraw/element/fractionalIndex";
+import { orderByFractionalIndex } from "@excalidraw/element";
 
 import type { SceneElementsMap } from "@excalidraw/element/types";
 

packages/excalidraw/actions/actionLinearEditor.tsx

@@ -1,12 +1,12 @@
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { LinearElementEditor } from "@excalidraw/element";
 import {
   isElbowArrow,
   isLinearElement,
   isLineElement,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
 import { arrayToMap } from "@excalidraw/common";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type {
   ExcalidrawLinearElement,

packages/excalidraw/actions/actionLink.tsx

@@ -1,8 +1,8 @@
-import { isEmbeddableElement } from "@excalidraw/element/typeChecks";
+import { isEmbeddableElement } from "@excalidraw/element";
 
 import { KEYS, getShortcutKey } from "@excalidraw/common";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { ToolButton } from "../components/ToolButton";
 import { getContextMenuLabel } from "../components/hyperlink/Hyperlink";

packages/excalidraw/actions/actionMenu.tsx

@@ -2,9 +2,9 @@ import { KEYS } from "@excalidraw/common";
 
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { showSelectedShapeActions } from "@excalidraw/element/showSelectedShapeActions";
+import { showSelectedShapeActions } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { ToolButton } from "../components/ToolButton";
 import { HamburgerMenuIcon, HelpIconThin, palette } from "../components/icons";

packages/excalidraw/actions/actionNavigate.tsx

@@ -1,6 +1,6 @@
 import clsx from "clsx";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { getClientColor } from "../clients";
 import { Avatar } from "../components/Avatar";

packages/excalidraw/actions/actionProperties.tsx

@@ -31,16 +31,16 @@ import {
   calculateFixedPointForElbowArrowBinding,
   getHoveredElementForBinding,
   updateBoundElements,
-} from "@excalidraw/element/binding";
+} from "@excalidraw/element";
 
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { LinearElementEditor } from "@excalidraw/element";
 
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
 
 import {
   getBoundTextElement,
   redrawTextBoundingBox,
-} from "@excalidraw/element/textElement";
+} from "@excalidraw/element";
 
 import {
   isArrowElement,
@@ -50,13 +50,13 @@ import {
   isLineElement,
   isTextElement,
   isUsingAdaptiveRadius,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
 
-import { hasStrokeColor } from "@excalidraw/element/comparisons";
+import { hasStrokeColor } from "@excalidraw/element";
 
-import { updateElbowArrowPoints } from "@excalidraw/element/elbowArrow";
+import { updateElbowArrowPoints } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { LocalPoint } from "@excalidraw/math";
 
@@ -72,9 +72,9 @@ import type {
   VerticalAlign,
 } from "@excalidraw/element/types";
 
-import type Scene from "@excalidraw/element/Scene";
+import type { Scene } from "@excalidraw/element";
 
-import type { CaptureUpdateActionType } from "@excalidraw/element/store";
+import type { CaptureUpdateActionType } from "@excalidraw/element";
 
 import { trackEvent } from "../analytics";
 import { ButtonIconSelect } from "../components/ButtonIconSelect";

packages/excalidraw/actions/actionSelectAll.ts

@@ -1,12 +1,12 @@
 import { getNonDeletedElements } from "@excalidraw/element";
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { LinearElementEditor } from "@excalidraw/element";
-import { isLinearElement, isTextElement } from "@excalidraw/element/typeChecks";
+import { isLinearElement, isTextElement } from "@excalidraw/element";
 
 import { arrayToMap, KEYS } from "@excalidraw/common";
 
-import { selectGroupsForSelectedElements } from "@excalidraw/element/groups";
+import { selectGroupsForSelectedElements } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 

packages/excalidraw/actions/actionStyles.ts

@@ -7,7 +7,7 @@ import {
   getLineHeight,
 } from "@excalidraw/common";
 
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
 
 import {
   hasBoundTextElement,
@@ -17,14 +17,14 @@ import {
   isArrowElement,
   isExcalidrawElement,
   isTextElement,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
 
 import {
   getBoundTextElement,
   redrawTextBoundingBox,
-} from "@excalidraw/element/textElement";
+} from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawTextElement } from "@excalidraw/element/types";
 

packages/excalidraw/actions/actionTextAutoResize.ts

@@ -1,11 +1,11 @@
 import { getFontString } from "@excalidraw/common";
 
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
-import { measureText } from "@excalidraw/element/textMeasurements";
+import { measureText } from "@excalidraw/element";
 
-import { isTextElement } from "@excalidraw/element/typeChecks";
+import { isTextElement } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { getSelectedElements } from "../scene";
 

packages/excalidraw/actions/actionToggleGridMode.tsx

@@ -1,6 +1,6 @@
 import { CODES, KEYS } from "@excalidraw/common";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { gridIcon } from "../components/icons";
 

packages/excalidraw/actions/actionToggleObjectsSnapMode.tsx

@@ -1,6 +1,6 @@
 import { CODES, KEYS } from "@excalidraw/common";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { magnetIcon } from "../components/icons";
 

packages/excalidraw/actions/actionToggleSearchMenu.ts

@@ -5,7 +5,7 @@ import {
   DEFAULT_SIDEBAR,
 } from "@excalidraw/common";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { searchIcon } from "../components/icons";
 
@@ -34,13 +34,6 @@ export const actionToggleSearchMenu = register({
           `.${CLASSES.SEARCH_MENU_INPUT_WRAPPER} input`,
         );
 
-      if (searchInput?.matches(":focus")) {
-        return {
-          appState: { ...appState, openSidebar: null },
-          captureUpdate: CaptureUpdateAction.EVENTUALLY,
-        };
-      }
-
       searchInput?.focus();
       searchInput?.select();
       return false;

packages/excalidraw/actions/actionToggleShapeSwitch.tsx

@@ -1,4 +1,4 @@
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 

packages/excalidraw/actions/actionToggleStats.tsx

@@ -1,6 +1,6 @@
 import { CODES, KEYS } from "@excalidraw/common";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { abacusIcon } from "../components/icons";
 

packages/excalidraw/actions/actionToggleViewMode.tsx

@@ -1,6 +1,6 @@
 import { CODES, KEYS } from "@excalidraw/common";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { eyeIcon } from "../components/icons";
 

packages/excalidraw/actions/actionToggleZenMode.tsx

@@ -1,6 +1,6 @@
 import { CODES, KEYS } from "@excalidraw/common";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { coffeeIcon } from "../components/icons";
 

packages/excalidraw/actions/actionZindex.tsx

@@ -5,9 +5,9 @@ import {
   moveOneRight,
   moveAllLeft,
   moveAllRight,
-} from "@excalidraw/element/zindex";
+} from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import {
   BringForwardIcon,

packages/excalidraw/actions/types.ts

@@ -3,7 +3,7 @@ import type {
   OrderedExcalidrawElement,
 } from "@excalidraw/element/types";
 
-import type { CaptureUpdateActionType } from "@excalidraw/element/store";
+import type { CaptureUpdateActionType } from "@excalidraw/element";
 
 import type {
   AppClassProperties,

packages/excalidraw/appState.ts

@@ -121,7 +121,7 @@ export const getDefaultAppState = (): Omit<
     followedBy: new Set(),
     isCropping: false,
     croppingElementId: null,
-    searchMatches: [],
+    searchMatches: null,
   };
 };
 

packages/excalidraw/charts.ts

@@ -15,7 +15,7 @@ import {
   newTextElement,
   newLinearElement,
   newElement,
-} from "@excalidraw/element/newElement";
+} from "@excalidraw/element";
 
 import type { Radians } from "@excalidraw/math";
 

packages/excalidraw/clipboard.ts

@@ -7,14 +7,14 @@ import {
   isPromiseLike,
 } from "@excalidraw/common";
 
-import { mutateElement } from "@excalidraw/element/mutateElement";
+import { mutateElement } from "@excalidraw/element";
-import { deepCopyElement } from "@excalidraw/element/duplicate";
+import { deepCopyElement } from "@excalidraw/element";
 import {
   isFrameLikeElement,
   isInitializedImageElement,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
 
-import { getContainingFrame } from "@excalidraw/element/frame";
+import { getContainingFrame } from "@excalidraw/element";
 
 import type {
   ExcalidrawElement,

packages/excalidraw/components/Actions.tsx

@@ -11,7 +11,7 @@ import {
 import {
   shouldAllowVerticalAlign,
   suppportsHorizontalAlign,
-} from "@excalidraw/element/textElement";
+} from "@excalidraw/element";
 
 import {
   hasBoundTextElement,
@@ -19,9 +19,9 @@ import {
   isImageElement,
   isLinearElement,
   isTextElement,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
 
-import { hasStrokeColor, toolIsArrow } from "@excalidraw/element/comparisons";
+import { hasStrokeColor, toolIsArrow } from "@excalidraw/element";
 
 import type {
   ExcalidrawElement,

packages/excalidraw/components/App.tsx

@@ -104,10 +104,7 @@ import {
   Emitter,
 } from "@excalidraw/common";
 
-import {
+import { getCommonBounds, getElementAbsoluteCoords } from "@excalidraw/element";
-  getCommonBounds,
-  getElementAbsoluteCoords,
-} from "@excalidraw/element/bounds";
 
 import {
   bindOrUnbindLinearElement,
@@ -120,11 +117,11 @@ import {
   shouldEnableBindingForPointerEvent,
   updateBoundElements,
   getSuggestedBindingsForArrows,
-} from "@excalidraw/element/binding";
+} from "@excalidraw/element";
 
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { LinearElementEditor } from "@excalidraw/element";
 
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
 
 import {
   newFrameElement,
@@ -138,12 +135,9 @@ import {
   newLinearElement,
   newTextElement,
   refreshTextDimensions,
-} from "@excalidraw/element/newElement";
+} from "@excalidraw/element";
 
-import {
+import { deepCopyElement, duplicateElements } from "@excalidraw/element";
-  deepCopyElement,
-  duplicateElements,
-} from "@excalidraw/element/duplicate";
 
 import {
   hasBoundTextElement,
@@ -166,7 +160,7 @@ import {
   isFlowchartNodeElement,
   isBindableElement,
   isTextElement,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
 
 import {
   getLockedLinearCursorAlignSize,
@@ -174,28 +168,28 @@ import {
   isElementCompletelyInViewport,
   isElementInViewport,
   isInvisiblySmallElement,
-} from "@excalidraw/element/sizeHelpers";
+} from "@excalidraw/element";
 
 import {
   getBoundTextShape,
   getCornerRadius,
   getElementShape,
   isPathALoop,
-} from "@excalidraw/element/shapes";
+} from "@excalidraw/element";
 
 import {
   createSrcDoc,
   embeddableURLValidator,
   maybeParseEmbedSrc,
   getEmbedLink,
-} from "@excalidraw/element/embeddable";
+} from "@excalidraw/element";
 
 import {
   getInitializedImageElements,
   loadHTMLImageElement,
   normalizeSVG,
   updateImageCache as _updateImageCache,
-} from "@excalidraw/element/image";
+} from "@excalidraw/element";
 
 import {
   getBoundTextElement,
@@ -203,9 +197,9 @@ import {
   getContainerElement,
   isValidTextContainer,
   redrawTextBoundingBox,
-} from "@excalidraw/element/textElement";
+} from "@excalidraw/element";
 
-import { shouldShowBoundingBox } from "@excalidraw/element/transformHandles";
+import { shouldShowBoundingBox } from "@excalidraw/element";
 
 import {
   getFrameChildren,
@@ -222,30 +216,27 @@ import {
   getFrameLikeTitle,
   getElementsOverlappingFrame,
   filterElementsEligibleAsFrameChildren,
-} from "@excalidraw/element/frame";
+} from "@excalidraw/element";
 
 import {
   hitElementBoundText,
   hitElementBoundingBoxOnly,
   hitElementItself,
-} from "@excalidraw/element/collision";
+} from "@excalidraw/element";
 
-import { getVisibleSceneBounds } from "@excalidraw/element/bounds";
+import { getVisibleSceneBounds } from "@excalidraw/element";
 
 import {
   FlowChartCreator,
   FlowChartNavigator,
   getLinkDirectionFromKey,
-} from "@excalidraw/element/flowchart";
+} from "@excalidraw/element";
 
-import { cropElement } from "@excalidraw/element/cropElement";
+import { cropElement } from "@excalidraw/element";
 
-import { wrapText } from "@excalidraw/element/textWrapping";
+import { wrapText } from "@excalidraw/element";
 
-import {
+import { isElementLink, parseElementLinkFromURL } from "@excalidraw/element";
-  isElementLink,
-  parseElementLinkFromURL,
-} from "@excalidraw/element/elementLink";
 
 import {
   isMeasureTextSupported,
@@ -255,11 +246,11 @@ import {
   getApproxMinLineWidth,
   getApproxMinLineHeight,
   getMinTextElementWidth,
-} from "@excalidraw/element/textMeasurements";
+} from "@excalidraw/element";
 
-import { ShapeCache } from "@excalidraw/element/ShapeCache";
+import { ShapeCache } from "@excalidraw/element";
 
-import { getRenderOpacity } from "@excalidraw/element/renderElement";
+import { getRenderOpacity } from "@excalidraw/element";
 
 import {
   editGroupForSelectedElement,
@@ -269,44 +260,41 @@ import {
   isElementInGroup,
   isSelectedViaGroup,
   selectGroupsForSelectedElements,
-} from "@excalidraw/element/groups";
+} from "@excalidraw/element";
 
-import {
+import { syncInvalidIndices, syncMovedIndices } from "@excalidraw/element";
-  syncInvalidIndices,
-  syncMovedIndices,
-} from "@excalidraw/element/fractionalIndex";
 
 import {
   excludeElementsInFramesFromSelection,
   getSelectionStateForElements,
   makeNextSelectedElementIds,
-} from "@excalidraw/element/selection";
+} from "@excalidraw/element";
 
 import {
   getResizeOffsetXY,
   getResizeArrowDirection,
   transformElements,
-} from "@excalidraw/element/resizeElements";
+} from "@excalidraw/element";
 
 import {
   getCursorForResizingElement,
   getElementWithTransformHandleType,
   getTransformHandleTypeFromCoords,
-} from "@excalidraw/element/resizeTest";
+} from "@excalidraw/element";
 
 import {
   dragNewElement,
   dragSelectedElements,
   getDragOffsetXY,
-} from "@excalidraw/element/dragElements";
+} from "@excalidraw/element";
 
 import { isNonDeletedElement } from "@excalidraw/element";
 
-import Scene from "@excalidraw/element/Scene";
+import { Scene } from "@excalidraw/element";
 
-import { Store, CaptureUpdateAction } from "@excalidraw/element/store";
+import { Store, CaptureUpdateAction } from "@excalidraw/element";
 
-import type { ElementUpdate } from "@excalidraw/element/mutateElement";
+import type { ElementUpdate } from "@excalidraw/element";
 
 import type { LocalPoint, Radians } from "@excalidraw/math";
 
@@ -1417,8 +1405,19 @@ class App extends React.Component<AppProps, AppState> {
     }
 
     const isDarkTheme = this.state.theme === THEME.DARK;
+    const nonDeletedFramesLikes = this.scene.getNonDeletedFramesLikes();
 
-    return this.scene.getNonDeletedFramesLikes().map((f) => {
+    const focusedSearchMatch =
+      nonDeletedFramesLikes.length > 0
+        ? this.state.searchMatches?.focusedId &&
+          isFrameLikeElement(
+            this.scene.getElement(this.state.searchMatches.focusedId),
+          )
+          ? this.state.searchMatches.matches.find((sm) => sm.focus)
+          : null
+        : null;
+
+    return nonDeletedFramesLikes.map((f) => {
       if (
         !isElementInViewport(
           f,
@@ -1484,7 +1483,7 @@ class App extends React.Component<AppProps, AppState> {
               borderRadius: 4,
               boxShadow: "inset 0 0 0 1px var(--color-primary)",
               fontFamily: "Assistant",
-              fontSize: "14px",
+              fontSize: `${FRAME_STYLE.nameFontSize}px`,
               transform: `translate(-${FRAME_NAME_EDIT_PADDING}px, ${FRAME_NAME_EDIT_PADDING}px)`,
               color: "var(--color-gray-80)",
               overflow: "hidden",
@@ -1528,7 +1527,10 @@ class App extends React.Component<AppProps, AppState> {
               : FRAME_STYLE.nameColorLightTheme,
             lineHeight: FRAME_STYLE.nameLineHeight,
             width: "max-content",
-            maxWidth: `${f.width}px`,
+            maxWidth:
+              focusedSearchMatch?.id === f.id && focusedSearchMatch?.focus
+                ? "none"
+                : `${f.width * this.state.zoom.value}px`,
             overflow: f.id === this.state.editingFrame ? "visible" : "hidden",
             whiteSpace: "nowrap",
             textOverflow: "ellipsis",
@@ -6405,12 +6407,17 @@ class App extends React.Component<AppProps, AppState> {
     this.maybeUnfollowRemoteUser();
 
     if (this.state.searchMatches) {
-      this.setState((state) => ({
+      this.setState((state) => {
-        searchMatches: state.searchMatches.map((searchMatch) => ({
+        return {
+          searchMatches: state.searchMatches && {
+            focusedId: null,
+            matches: state.searchMatches.matches.map((searchMatch) => ({
               ...searchMatch,
               focus: false,
             })),
-      }));
+          },
+        };
+      });
       this.updateEditorAtom(searchItemInFocusAtom, null);
     }
 

packages/excalidraw/components/ConvertElementTypePopup.tsx

@@ -1,6 +1,6 @@
 import { type ReactNode, useEffect, useMemo, useRef, useState } from "react";
 
-import { updateElbowArrowPoints } from "@excalidraw/element/elbowArrow";
+import { updateElbowArrowPoints } from "@excalidraw/element";
 
 import { pointFrom, pointRotateRads, type LocalPoint } from "@excalidraw/math";
 
@@ -13,21 +13,21 @@ import {
   isLinearElement,
   isSharpArrow,
   isUsingAdaptiveRadius,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
 
 import {
   getCommonBoundingBox,
   getElementAbsoluteCoords,
-} from "@excalidraw/element/bounds";
+} from "@excalidraw/element";
 
 import {
   getBoundTextElement,
   getBoundTextMaxHeight,
   getBoundTextMaxWidth,
   redrawTextBoundingBox,
-} from "@excalidraw/element/textElement";
+} from "@excalidraw/element";
 
-import { wrapText } from "@excalidraw/element/textWrapping";
+import { wrapText } from "@excalidraw/element";
 
 import {
   assertNever,
@@ -37,17 +37,19 @@ import {
   updateActiveTool,
 } from "@excalidraw/common";
 
-import { measureText } from "@excalidraw/element/textMeasurements";
+import { measureText } from "@excalidraw/element";
 
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { LinearElementEditor } from "@excalidraw/element";
 
 import {
   newArrowElement,
   newElement,
   newLinearElement,
-} from "@excalidraw/element/newElement";
+} from "@excalidraw/element";
 
-import { ShapeCache } from "@excalidraw/element/ShapeCache";
+import { ShapeCache } from "@excalidraw/element";
+
+import { updateBindings } from "@excalidraw/element";
 
 import type {
   ConvertibleGenericTypes,
@@ -66,7 +68,7 @@ import type {
   FixedSegment,
 } from "@excalidraw/element/types";
 
-import type Scene from "@excalidraw/element/Scene";
+import type { Scene } from "@excalidraw/element";
 
 import {
   bumpVersion,
@@ -76,7 +78,6 @@ import {
 } from "..";
 import { trackEvent } from "../analytics";
 import { atom, editorJotaiStore, useSetAtom } from "../editor-jotai";
-import { updateBindings } from "../../element/src/binding";
 
 import "./ConvertElementTypePopup.scss";
 import { ToolButton } from "./ToolButton";

packages/excalidraw/components/ElementCanvasButtons.tsx

@@ -1,5 +1,5 @@
 import { sceneCoordsToViewportCoords } from "@excalidraw/common";
-import { getElementAbsoluteCoords } from "@excalidraw/element/bounds";
+import { getElementAbsoluteCoords } from "@excalidraw/element";
 
 import type {
   ElementsMap,

packages/excalidraw/components/ElementLinkDialog.tsx

@@ -5,11 +5,11 @@ import { normalizeLink, KEYS } from "@excalidraw/common";
 import {
   defaultGetElementLinkFromSelection,
   getLinkIdAndTypeFromSelection,
-} from "@excalidraw/element/elementLink";
+} from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
-import type Scene from "@excalidraw/element/Scene";
+import type { Scene } from "@excalidraw/element";
 
 import { t } from "../i18n";
 import { getSelectedElements } from "../scene";

packages/excalidraw/components/FontPicker/FontPickerList.tsx

@@ -99,7 +99,7 @@ export const FontPickerList = React.memo(
       () =>
         Array.from(Fonts.registered.entries())
           .filter(
-            ([_, { metadata }]) => !metadata.serverSide && !metadata.fallback,
+            ([_, { metadata }]) => !metadata.private && !metadata.fallback,
           )
           .map(([familyId, { metadata, fontFaces }]) => {
             const fontDescriptor = {

packages/excalidraw/components/HintViewer.tsx

@@ -6,11 +6,11 @@ import {
   isLinearElement,
   isTextBindableContainer,
   isTextElement,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
 
 import { getShortcutKey } from "@excalidraw/common";
 
-import { isNodeInFlowchart } from "@excalidraw/element/flowchart";
+import { isNodeInFlowchart } from "@excalidraw/element";
 
 import { t } from "../i18n";
 import { isEraserActive } from "../appState";
@@ -39,7 +39,7 @@ const getHints = ({
   if (
     appState.openSidebar?.name === DEFAULT_SIDEBAR.name &&
     appState.openSidebar.tab === CANVAS_SEARCH_TAB &&
-    appState.searchMatches?.length
+    appState.searchMatches?.matches.length
   ) {
     return t("hints.dismissSearch");
   }

packages/excalidraw/components/LayerUI.tsx

@@ -10,11 +10,11 @@ import {
   isShallowEqual,
 } from "@excalidraw/common";
 
-import { mutateElement } from "@excalidraw/element/mutateElement";
+import { mutateElement } from "@excalidraw/element";
 
-import { showSelectedShapeActions } from "@excalidraw/element/showSelectedShapeActions";
+import { showSelectedShapeActions } from "@excalidraw/element";
 
-import { ShapeCache } from "@excalidraw/element/ShapeCache";
+import { ShapeCache } from "@excalidraw/element";
 
 import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types";
 

packages/excalidraw/components/LibraryMenuItems.tsx

@@ -8,7 +8,7 @@ import React, {
 
 import { MIME_TYPES, arrayToMap } from "@excalidraw/common";
 
-import { duplicateElements } from "@excalidraw/element/duplicate";
+import { duplicateElements } from "@excalidraw/element";
 
 import { serializeLibraryAsJSON } from "../data/json";
 import { useLibraryCache } from "../hooks/useLibraryItemSvg";

packages/excalidraw/components/MobileMenu.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { showSelectedShapeActions } from "@excalidraw/element/showSelectedShapeActions";
+import { showSelectedShapeActions } from "@excalidraw/element";
 
 import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types";
 

packages/excalidraw/components/SearchMenu.scss

@@ -1,4 +1,5 @@
 @import "open-color/open-color";
+@import "../css//variables.module.scss";
 
 .excalidraw {
   .layer-ui__search {
@@ -64,21 +65,51 @@
     flex: 1 1 0;
     display: flex;
     flex-direction: column;
+    padding: 0 0.75rem;
 
     gap: 0.125rem;
   }
 
+  .layer-ui__search .collapsible-items {
+    gap: 2px;
+  }
+
+  .layer-ui__search-result-title {
+    font-size: 0.875rem;
+    margin-bottom: 0.25rem;
+    display: flex;
+    align-items: center;
+    gap: 0.25rem;
+    font-weight: 700;
+
+    .title-icon {
+      width: 0.875rem;
+      height: 0.875rem;
+      margin-right: 0.25rem;
+      svg g {
+        stroke-width: 1.25;
+      }
+    }
+  }
+
+  .layer-ui__divider {
+    width: 100%;
+    margin-top: 0.25rem;
+    margin-bottom: 1rem;
+    position: relative;
+  }
+
   .layer-ui__result-item {
     display: flex;
     align-items: center;
-    min-height: 2rem;
+    min-height: 1.875rem;
     flex: 0 0 auto;
     padding: 0.25rem 0.75rem;
     cursor: pointer;
     border: 1px solid transparent;
     outline: none;
+    font-size: 16px;
 
-    margin: 0 0.75rem;
     border-radius: var(--border-radius-md);
 
     .text-icon {

packages/excalidraw/components/SearchMenu.tsx

@@ -1,13 +1,19 @@
 import { round } from "@excalidraw/math";
 import clsx from "clsx";
 import debounce from "lodash.debounce";
-import { Fragment, memo, useEffect, useRef, useState } from "react";
+import { Fragment, memo, useEffect, useMemo, useRef, useState } from "react";
 
-import { CLASSES, EVENT } from "@excalidraw/common";
+import {
+  CLASSES,
+  EVENT,
+  FONT_FAMILY,
+  FRAME_STYLE,
+  getLineHeight,
+} from "@excalidraw/common";
 
-import { isElementCompletelyInViewport } from "@excalidraw/element/sizeHelpers";
+import { isElementCompletelyInViewport } from "@excalidraw/element";
 
-import { measureText } from "@excalidraw/element/textMeasurements";
+import { measureText } from "@excalidraw/element";
 
 import {
   KEYS,
@@ -16,10 +22,15 @@ import {
   getFontString,
 } from "@excalidraw/common";
 
-import { newTextElement } from "@excalidraw/element/newElement";
+import { newTextElement } from "@excalidraw/element";
-import { isTextElement } from "@excalidraw/element/typeChecks";
+import { isTextElement, isFrameLikeElement } from "@excalidraw/element";
 
-import type { ExcalidrawTextElement } from "@excalidraw/element/types";
+import { getDefaultFrameName } from "@excalidraw/element/frame";
+
+import type {
+  ExcalidrawFrameLikeElement,
+  ExcalidrawTextElement,
+} from "@excalidraw/element/types";
 
 import { atom, useAtom } from "../editor-jotai";
 
@@ -29,11 +40,17 @@ import { t } from "../i18n";
 import { useApp, useExcalidrawSetAppState } from "./App";
 import { Button } from "./Button";
 import { TextField } from "./TextField";
-import { collapseDownIcon, upIcon, searchIcon } from "./icons";
+import {
+  collapseDownIcon,
+  upIcon,
+  searchIcon,
+  frameToolIcon,
+  TextIcon,
+} from "./icons";
 
 import "./SearchMenu.scss";
 
-import type { AppClassProperties } from "../types";
+import type { AppClassProperties, SearchMatch } from "../types";
 
 const searchQueryAtom = atom<string>("");
 export const searchItemInFocusAtom = atom<number | null>(null);
@@ -41,7 +58,7 @@ export const searchItemInFocusAtom = atom<number | null>(null);
 const SEARCH_DEBOUNCE = 350;
 
 type SearchMatchItem = {
-  textElement: ExcalidrawTextElement;
+  element: ExcalidrawTextElement | ExcalidrawFrameLikeElement;
   searchQuery: SearchQuery;
   index: number;
   preview: {
@@ -50,12 +67,7 @@ type SearchMatchItem = {
     moreBefore: boolean;
     moreAfter: boolean;
   };
-  matchedLines: {
+  matchedLines: SearchMatch["matchedLines"];
-    offsetX: number;
-    offsetY: number;
-    width: number;
-    height: number;
-  }[];
 };
 
 type SearchMatches = {
@@ -103,11 +115,16 @@ export const SearchMenu = () => {
         searchedQueryRef.current = searchQuery;
         lastSceneNonceRef.current = app.scene.getSceneNonce();
         setAppState({
-          searchMatches: matchItems.map((searchMatch) => ({
+          searchMatches: matchItems.length
-            id: searchMatch.textElement.id,
+            ? {
+                focusedId: null,
+                matches: matchItems.map((searchMatch) => ({
+                  id: searchMatch.element.id,
                   focus: false,
                   matchedLines: searchMatch.matchedLines,
                 })),
+              }
+            : null,
         });
       });
     }
@@ -149,13 +166,25 @@ export const SearchMenu = () => {
 
   useEffect(() => {
     setAppState((state) => {
+      if (!state.searchMatches) {
+        return null;
+      }
+
+      const focusedId =
+        focusIndex !== null
+          ? state.searchMatches?.matches[focusIndex]?.id || null
+          : null;
+
       return {
-        searchMatches: state.searchMatches.map((match, index) => {
+        searchMatches: {
+          focusedId,
+          matches: state.searchMatches.matches.map((match, index) => {
             if (index === focusIndex) {
               return { ...match, focus: true };
             }
             return { ...match, focus: false };
           }),
+        },
       };
     });
   }, [focusIndex, setAppState]);
@@ -169,17 +198,21 @@ export const SearchMenu = () => {
 
         const matchAsElement = newTextElement({
           text: match.searchQuery,
-          x: match.textElement.x + (match.matchedLines[0]?.offsetX ?? 0),
+          x: match.element.x + (match.matchedLines[0]?.offsetX ?? 0),
-          y: match.textElement.y + (match.matchedLines[0]?.offsetY ?? 0),
+          y: match.element.y + (match.matchedLines[0]?.offsetY ?? 0),
           width: match.matchedLines[0]?.width,
           height: match.matchedLines[0]?.height,
-          fontSize: match.textElement.fontSize,
+          fontSize: isFrameLikeElement(match.element)
-          fontFamily: match.textElement.fontFamily,
+            ? FRAME_STYLE.nameFontSize
+            : match.element.fontSize,
+          fontFamily: isFrameLikeElement(match.element)
+            ? FONT_FAMILY.Assistant
+            : match.element.fontFamily,
         });
 
         const FONT_SIZE_LEGIBILITY_THRESHOLD = 14;
 
-        const fontSize = match.textElement.fontSize;
+        const fontSize = matchAsElement.fontSize;
         const isTextTiny =
           fontSize * zoomValue < FONT_SIZE_LEGIBILITY_THRESHOLD;
 
@@ -233,7 +266,7 @@ export const SearchMenu = () => {
       searchedQueryRef.current = null;
       lastSceneNonceRef.current = undefined;
       setAppState({
-        searchMatches: [],
+        searchMatches: null,
       });
       setIsSearching(false);
     };
@@ -272,10 +305,6 @@ export const SearchMenu = () => {
           }
           searchInputRef.current?.focus();
           searchInputRef.current?.select();
-        } else {
-          setAppState({
-            openSidebar: null,
-          });
         }
       }
 
@@ -336,11 +365,16 @@ export const SearchMenu = () => {
               searchedQueryRef.current = searchQuery;
               lastSceneNonceRef.current = app.scene.getSceneNonce();
               setAppState({
-                searchMatches: matchItems.map((searchMatch) => ({
+                searchMatches: matchItems.length
-                  id: searchMatch.textElement.id,
+                  ? {
+                      focusedId: null,
+                      matches: matchItems.map((searchMatch) => ({
+                        id: searchMatch.element.id,
                         focus: false,
                         matchedLines: searchMatch.matchedLines,
                       })),
+                    }
+                  : null,
               });
 
               setIsSearching(false);
@@ -447,17 +481,56 @@ interface MatchListProps {
 }
 
 const MatchListBase = (props: MatchListProps) => {
+  const frameNameMatches = useMemo(
+    () =>
+      props.matches.items.filter((match) => isFrameLikeElement(match.element)),
+    [props.matches],
+  );
+
+  const textMatches = useMemo(
+    () => props.matches.items.filter((match) => isTextElement(match.element)),
+    [props.matches],
+  );
+
   return (
+    <div>
+      {frameNameMatches.length > 0 && (
         <div className="layer-ui__search-result-container">
-      {props.matches.items.map((searchMatch, index) => (
+          <div className="layer-ui__search-result-title">
+            <div className="title-icon">{frameToolIcon}</div>
+            <div>{t("search.frames")}</div>
+          </div>
+          {frameNameMatches.map((searchMatch, index) => (
             <ListItem
-          key={searchMatch.textElement.id + searchMatch.index}
+              key={searchMatch.element.id + searchMatch.index}
               searchQuery={props.searchQuery}
               preview={searchMatch.preview}
               highlighted={index === props.focusIndex}
               onClick={() => props.onItemClick(index)}
             />
           ))}
+
+          {textMatches.length > 0 && <div className="layer-ui__divider" />}
+        </div>
+      )}
+
+      {textMatches.length > 0 && (
+        <div className="layer-ui__search-result-container">
+          <div className="layer-ui__search-result-title">
+            <div className="title-icon">{TextIcon}</div>
+            <div>{t("search.texts")}</div>
+          </div>
+          {textMatches.map((searchMatch, index) => (
+            <ListItem
+              key={searchMatch.element.id + searchMatch.index}
+              searchQuery={props.searchQuery}
+              preview={searchMatch.preview}
+              highlighted={index + frameNameMatches.length === props.focusIndex}
+              onClick={() => props.onItemClick(index + frameNameMatches.length)}
+            />
+          ))}
+        </div>
+      )}
     </div>
   );
 };
@@ -592,12 +665,7 @@ const getMatchedLines = (
     index,
     index + searchQuery.length,
   );
-  const matchedLines: {
+  const matchedLines: SearchMatch["matchedLines"] = [];
-    offsetX: number;
-    offsetY: number;
-    width: number;
-    height: number;
-  }[] = [];
 
   for (const lineIndexRange of lineIndexRanges) {
     if (remainingQuery === "") {
@@ -657,6 +725,7 @@ const getMatchedLines = (
         offsetY,
         width,
         height,
+        showOnCanvas: true,
       });
 
       startIndex += matchCapacity;
@@ -666,6 +735,47 @@ const getMatchedLines = (
   return matchedLines;
 };
 
+const getMatchInFrame = (
+  frame: ExcalidrawFrameLikeElement,
+  searchQuery: SearchQuery,
+  index: number,
+  zoomValue: number,
+): SearchMatch["matchedLines"] => {
+  const text = frame.name ?? getDefaultFrameName(frame);
+  const matchedText = text.slice(index, index + searchQuery.length);
+
+  const prefixText = text.slice(0, index);
+  const font = getFontString({
+    fontSize: FRAME_STYLE.nameFontSize,
+    fontFamily: FONT_FAMILY.Assistant,
+  });
+
+  const lineHeight = getLineHeight(FONT_FAMILY.Assistant);
+
+  const offset = measureText(prefixText, font, lineHeight);
+
+  // Correct non-zero width for empty string
+  if (prefixText === "") {
+    offset.width = 0;
+  }
+
+  const matchedMetrics = measureText(matchedText, font, lineHeight);
+
+  const offsetX = offset.width;
+  const offsetY = -offset.height - FRAME_STYLE.strokeWidth;
+  const width = matchedMetrics.width;
+
+  return [
+    {
+      offsetX,
+      offsetY,
+      width,
+      height: matchedMetrics.height,
+      showOnCanvas: offsetX + width <= frame.width * zoomValue,
+    },
+  ];
+};
+
 const escapeSpecialCharacters = (string: string) => {
   return string.replace(/[.*+?^${}()|[\]\\-]/g, "\\$&");
 };
@@ -686,9 +796,14 @@ const handleSearch = debounce(
       isTextElement(el),
     ) as ExcalidrawTextElement[];
 
-    texts.sort((a, b) => a.y - b.y);
+    const frames = elements.filter((el) =>
+      isFrameLikeElement(el),
+    ) as ExcalidrawFrameLikeElement[];
 
-    const matchItems: SearchMatchItem[] = [];
+    texts.sort((a, b) => a.y - b.y);
+    frames.sort((a, b) => a.y - b.y);
+
+    const textMatches: SearchMatchItem[] = [];
 
     const regex = new RegExp(escapeSpecialCharacters(searchQuery), "gi");
 
@@ -701,8 +816,35 @@ const handleSearch = debounce(
         const matchedLines = getMatchedLines(textEl, searchQuery, match.index);
 
         if (matchedLines.length > 0) {
-          matchItems.push({
+          textMatches.push({
-            textElement: textEl,
+            element: textEl,
+            searchQuery,
+            preview,
+            index: match.index,
+            matchedLines,
+          });
+        }
+      }
+    }
+
+    const frameMatches: SearchMatchItem[] = [];
+
+    for (const frame of frames) {
+      let match = null;
+      const name = frame.name ?? getDefaultFrameName(frame);
+
+      while ((match = regex.exec(name)) !== null) {
+        const preview = getMatchPreview(name, match.index, searchQuery);
+        const matchedLines = getMatchInFrame(
+          frame,
+          searchQuery,
+          match.index,
+          app.state.zoom.value,
+        );
+
+        if (matchedLines.length > 0) {
+          frameMatches.push({
+            element: frame,
             searchQuery,
             preview,
             index: match.index,
@@ -716,9 +858,12 @@ const handleSearch = debounce(
       app.visibleElements.map((visibleElement) => visibleElement.id),
     );
 
+    // putting frame matches first
+    const matchItems: SearchMatchItem[] = [...frameMatches, ...textMatches];
+
     const focusIndex =
       matchItems.findIndex((matchItem) =>
-        visibleIds.has(matchItem.textElement.id),
+        visibleIds.has(matchItem.element.id),
       ) ?? null;
 
     cb(matchItems, focusIndex);

packages/excalidraw/components/Stats/Angle.tsx

@@ -1,18 +1,18 @@
 import { degreesToRadians, radiansToDegrees } from "@excalidraw/math";
 
-import { getBoundTextElement } from "@excalidraw/element/textElement";
+import { getBoundTextElement } from "@excalidraw/element";
-import { isArrowElement, isElbowArrow } from "@excalidraw/element/typeChecks";
+import { isArrowElement, isElbowArrow } from "@excalidraw/element";
+
+import { updateBindings } from "@excalidraw/element";
 
 import type { Degrees } from "@excalidraw/math";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
-import type Scene from "@excalidraw/element/Scene";
+import type { Scene } from "@excalidraw/element";
 
 import { angleIcon } from "../icons";
 
-import { updateBindings } from "../../../element/src/binding";
-
 import DragInput from "./DragInput";
 import { getStepSizedValue, isPropertyEditable } from "./utils";
 

packages/excalidraw/components/Stats/CanvasGrid.tsx

@@ -1,4 +1,4 @@
-import type Scene from "@excalidraw/element/Scene";
+import type { Scene } from "@excalidraw/element";
 
 import { getNormalizedGridStep } from "../../scene";
 

packages/excalidraw/components/Stats/Collapsible.tsx

@@ -10,6 +10,7 @@ interface CollapsibleProps {
   openTrigger: () => void;
   children: React.ReactNode;
   className?: string;
+  showCollapsedIcon?: boolean;
 }
 
 const Collapsible = ({
@@ -18,6 +19,7 @@ const Collapsible = ({
   openTrigger,
   children,
   className,
+  showCollapsedIcon = true,
 }: CollapsibleProps) => {
   return (
     <>
@@ -32,7 +34,9 @@ const Collapsible = ({
         onClick={openTrigger}
       >
         {label}
+        {showCollapsedIcon && (
           <InlineIcon icon={open ? collapseUpIcon : collapseDownIcon} />
+        )}
       </div>
       {open && (
         <div style={{ display: "flex", flexDirection: "column" }}>

packages/excalidraw/components/Stats/Dimension.tsx

@@ -4,13 +4,13 @@ import { MIN_WIDTH_OR_HEIGHT } from "@excalidraw/common";
 import {
   MINIMAL_CROP_SIZE,
   getUncroppedWidthAndHeight,
-} from "@excalidraw/element/cropElement";
+} from "@excalidraw/element";
-import { resizeSingleElement } from "@excalidraw/element/resizeElements";
+import { resizeSingleElement } from "@excalidraw/element";
-import { isImageElement } from "@excalidraw/element/typeChecks";
+import { isImageElement } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
-import type Scene from "@excalidraw/element/Scene";
+import type { Scene } from "@excalidraw/element";
 
 import DragInput from "./DragInput";
 import { getStepSizedValue, isPropertyEditable } from "./utils";

packages/excalidraw/components/Stats/DragInput.tsx

@@ -3,13 +3,13 @@ import { useEffect, useRef, useState } from "react";
 
 import { EVENT, KEYS, cloneJSON } from "@excalidraw/common";
 
-import { deepCopyElement } from "@excalidraw/element/duplicate";
+import { deepCopyElement } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element/store";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ElementsMap, ExcalidrawElement } from "@excalidraw/element/types";
 
-import type Scene from "@excalidraw/element/Scene";
+import type { Scene } from "@excalidraw/element";
 
 import { useApp } from "../App";
 import { InlineIcon } from "../InlineIcon";

packages/excalidraw/components/Stats/FontSize.tsx

@@ -1,18 +1,15 @@
 import {
   getBoundTextElement,
   redrawTextBoundingBox,
-} from "@excalidraw/element/textElement";
+} from "@excalidraw/element";
-import {
+import { hasBoundTextElement, isTextElement } from "@excalidraw/element";
-  hasBoundTextElement,
-  isTextElement,
-} from "@excalidraw/element/typeChecks";
 
 import type {
   ExcalidrawElement,
   ExcalidrawTextElement,
 } from "@excalidraw/element/types";
 
-import type Scene from "@excalidraw/element/Scene";
+import type { Scene } from "@excalidraw/element";
 
 import { fontSizeIcon } from "../icons";
 

packages/excalidraw/components/Stats/MultiAngle.tsx

@@ -1,15 +1,15 @@
 import { degreesToRadians, radiansToDegrees } from "@excalidraw/math";
 
-import { getBoundTextElement } from "@excalidraw/element/textElement";
+import { getBoundTextElement } from "@excalidraw/element";
-import { isArrowElement } from "@excalidraw/element/typeChecks";
+import { isArrowElement } from "@excalidraw/element";
 
-import { isInGroup } from "@excalidraw/element/groups";
+import { isInGroup } from "@excalidraw/element";
 
 import type { Degrees } from "@excalidraw/math";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
-import type Scene from "@excalidraw/element/Scene";
+import type { Scene } from "@excalidraw/element";
 
 import { angleIcon } from "../icons";
 

packages/excalidraw/components/Stats/MultiDimension.tsx

@@ -2,17 +2,14 @@ import { pointFrom, type GlobalPoint } from "@excalidraw/math";
 import { useMemo } from "react";
 
 import { MIN_WIDTH_OR_HEIGHT } from "@excalidraw/common";
-import { updateBoundElements } from "@excalidraw/element/binding";
+import { updateBoundElements } from "@excalidraw/element";
 import {
   rescalePointsInElement,
   resizeSingleElement,
-} from "@excalidraw/element/resizeElements";
+} from "@excalidraw/element";
-import {
+import { getBoundTextElement, handleBindTextResize } from "@excalidraw/element";
-  getBoundTextElement,
-  handleBindTextResize,
-} from "@excalidraw/element/textElement";
 
-import { isTextElement } from "@excalidraw/element/typeChecks";
+import { isTextElement } from "@excalidraw/element";
 
 import { getCommonBounds } from "@excalidraw/utils";
 
@@ -22,7 +19,7 @@ import type {
   NonDeletedSceneElementsMap,
 } from "@excalidraw/element/types";
 
-import type Scene from "@excalidraw/element/Scene";
+import type { Scene } from "@excalidraw/element";
 
 import DragInput from "./DragInput";
 import { getAtomicUnits, getStepSizedValue, isPropertyEditable } from "./utils";

packages/excalidraw/components/Stats/MultiFontSize.tsx

@@ -1,13 +1,10 @@
 import {
   getBoundTextElement,
   redrawTextBoundingBox,
-} from "@excalidraw/element/textElement";
+} from "@excalidraw/element";
-import {
+import { hasBoundTextElement, isTextElement } from "@excalidraw/element";
-  hasBoundTextElement,
-  isTextElement,
-} from "@excalidraw/element/typeChecks";
 
-import { isInGroup } from "@excalidraw/element/groups";
+import { isInGroup } from "@excalidraw/element";
 
 import type {
   ExcalidrawElement,
@@ -15,7 +12,7 @@ import type {
   NonDeletedSceneElementsMap,
 } from "@excalidraw/element/types";
 
-import type Scene from "@excalidraw/element/Scene";
+import type { Scene } from "@excalidraw/element";
 
 import { fontSizeIcon } from "../icons";
 

packages/excalidraw/components/Stats/MultiPosition.tsx

@@ -1,13 +1,13 @@
 import { pointFrom, pointRotateRads } from "@excalidraw/math";
 import { useMemo } from "react";
 
-import { isTextElement } from "@excalidraw/element/typeChecks";
+import { isTextElement } from "@excalidraw/element";
 
-import { getCommonBounds } from "@excalidraw/element/bounds";
+import { getCommonBounds } from "@excalidraw/element";
 
 import type { ElementsMap, ExcalidrawElement } from "@excalidraw/element/types";
 
-import type Scene from "@excalidraw/element/Scene";
+import type { Scene } from "@excalidraw/element";
 
 import StatsDragInput from "./DragInput";
 import {

packages/excalidraw/components/Stats/Position.tsx

@@ -3,12 +3,12 @@ import { clamp, pointFrom, pointRotateRads, round } from "@excalidraw/math";
 import {
   getFlipAdjustedCropPosition,
   getUncroppedWidthAndHeight,
-} from "@excalidraw/element/cropElement";
+} from "@excalidraw/element";
-import { isImageElement } from "@excalidraw/element/typeChecks";
+import { isImageElement } from "@excalidraw/element";
 
 import type { ElementsMap, ExcalidrawElement } from "@excalidraw/element/types";
 
-import type Scene from "@excalidraw/element/Scene";
+import type { Scene } from "@excalidraw/element";
 
 import StatsDragInput from "./DragInput";
 import { getStepSizedValue, moveElement, STEP_SIZE } from "./utils";

packages/excalidraw/components/Stats/index.tsx

@@ -4,13 +4,13 @@ import throttle from "lodash.throttle";
 import { useEffect, useMemo, useState, memo } from "react";
 
 import { STATS_PANELS } from "@excalidraw/common";
-import { getCommonBounds } from "@excalidraw/element/bounds";
+import { getCommonBounds } from "@excalidraw/element";
-import { getUncroppedWidthAndHeight } from "@excalidraw/element/cropElement";
+import { getUncroppedWidthAndHeight } from "@excalidraw/element";
-import { isElbowArrow, isImageElement } from "@excalidraw/element/typeChecks";
+import { isElbowArrow, isImageElement } from "@excalidraw/element";
 
-import { frameAndChildrenSelectedTogether } from "@excalidraw/element/frame";
+import { frameAndChildrenSelectedTogether } from "@excalidraw/element";
 
-import { elementsAreInSameGroup } from "@excalidraw/element/groups";
+import { elementsAreInSameGroup } from "@excalidraw/element";
 
 import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types";
 

packages/excalidraw/components/Stats/stats.test.tsx

@@ -5,9 +5,9 @@ import { vi } from "vitest";
 
 import { setDateTimeForTests, reseed } from "@excalidraw/common";
 
-import { isInGroup } from "@excalidraw/element/groups";
+import { isInGroup } from "@excalidraw/element";
 
-import { isTextElement } from "@excalidraw/element/typeChecks";
+import { isTextElement } from "@excalidraw/element";
 
 import type { Degrees } from "@excalidraw/math";
 

packages/excalidraw/components/Stats/utils.ts

@@ -1,18 +1,17 @@
 import { pointFrom, pointRotateRads } from "@excalidraw/math";
 
-import { getBoundTextElement } from "@excalidraw/element/textElement";
+import { getBoundTextElement } from "@excalidraw/element";
-import {
+import { isFrameLikeElement, isTextElement } from "@excalidraw/element";
-  isFrameLikeElement,
-  isTextElement,
-} from "@excalidraw/element/typeChecks";
 
 import {
   getSelectedGroupIds,
   getElementsInGroup,
   isInGroup,
-} from "@excalidraw/element/groups";
+} from "@excalidraw/element";
 
-import { getFrameChildren } from "@excalidraw/element/frame";
+import { getFrameChildren } from "@excalidraw/element";
+
+import { updateBindings } from "@excalidraw/element";
 
 import type { Radians } from "@excalidraw/math";
 
@@ -22,9 +21,7 @@ import type {
   NonDeletedExcalidrawElement,
 } from "@excalidraw/element/types";
 
-import type Scene from "@excalidraw/element/Scene";
+import type { Scene } from "@excalidraw/element";
-
-import { updateBindings } from "../../../element/src/binding";
 
 import type { AppState } from "../../types";
 

packages/excalidraw/components/hyperlink/Hyperlink.tsx

@@ -10,16 +10,13 @@ import {
 
 import { EVENT, HYPERLINK_TOOLTIP_DELAY, KEYS } from "@excalidraw/common";
 
-import { getElementAbsoluteCoords } from "@excalidraw/element/bounds";
+import { getElementAbsoluteCoords } from "@excalidraw/element";
 
-import { hitElementBoundingBox } from "@excalidraw/element/collision";
+import { hitElementBoundingBox } from "@excalidraw/element";
 
-import { isElementLink } from "@excalidraw/element/elementLink";
+import { isElementLink } from "@excalidraw/element";
 
-import {
+import { getEmbedLink, embeddableURLValidator } from "@excalidraw/element";
-  getEmbedLink,
-  embeddableURLValidator,
-} from "@excalidraw/element/embeddable";
 
 import {
   sceneCoordsToViewportCoords,
@@ -29,9 +26,9 @@ import {
   normalizeLink,
 } from "@excalidraw/common";
 
-import { isEmbeddableElement } from "@excalidraw/element/typeChecks";
+import { isEmbeddableElement } from "@excalidraw/element";
 
-import type Scene from "@excalidraw/element/Scene";
+import type { Scene } from "@excalidraw/element";
 
 import type {
   ElementsMap,

packages/excalidraw/components/hyperlink/helpers.ts

@@ -1,14 +1,14 @@
 import { pointFrom, pointRotateRads } from "@excalidraw/math";
 
 import { MIME_TYPES } from "@excalidraw/common";
-import { getElementAbsoluteCoords } from "@excalidraw/element/bounds";
+import { getElementAbsoluteCoords } from "@excalidraw/element";
-import { hitElementBoundingBox } from "@excalidraw/element/collision";
+import { hitElementBoundingBox } from "@excalidraw/element";
 
-import { DEFAULT_LINK_SIZE } from "@excalidraw/element/renderElement";
+import { DEFAULT_LINK_SIZE } from "@excalidraw/element";
 
 import type { GlobalPoint, Radians } from "@excalidraw/math";
 
-import type { Bounds } from "@excalidraw/element/bounds";
+import type { Bounds } from "@excalidraw/element";
 import type {
   ElementsMap,
   NonDeletedExcalidrawElement,

packages/excalidraw/data/index.ts

@@ -10,9 +10,9 @@ import {
 
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { isFrameLikeElement } from "@excalidraw/element/typeChecks";
+import { isFrameLikeElement } from "@excalidraw/element";
 
-import { getElementsOverlappingFrame } from "@excalidraw/element/frame";
+import { getElementsOverlappingFrame } from "@excalidraw/element";
 
 import type {
   ExcalidrawElement,

packages/excalidraw/data/library.ts

@@ -19,7 +19,7 @@ import {
 
 import { hashElementsVersion, hashString } from "@excalidraw/element";
 
-import { getCommonBoundingBox } from "@excalidraw/element/bounds";
+import { getCommonBoundingBox } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 

packages/excalidraw/data/reconcile.ts

@@ -6,7 +6,7 @@ import {
   orderByFractionalIndex,
   syncInvalidIndices,
   validateFractionalIndices,
-} from "@excalidraw/element/fractionalIndex";
+} from "@excalidraw/element";
 
 import type { OrderedExcalidrawElement } from "@excalidraw/element/types";
 

packages/excalidraw/data/restore.ts

@@ -19,15 +19,15 @@ import {
   getLineHeight,
 } from "@excalidraw/common";
 import { getNonDeletedElements } from "@excalidraw/element";
-import { normalizeFixedPoint } from "@excalidraw/element/binding";
+import { normalizeFixedPoint } from "@excalidraw/element";
 import {
   updateElbowArrowPoints,
   validateElbowPoints,
-} from "@excalidraw/element/elbowArrow";
+} from "@excalidraw/element";
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { LinearElementEditor } from "@excalidraw/element";
-import { bumpVersion } from "@excalidraw/element/mutateElement";
+import { bumpVersion } from "@excalidraw/element";
-import { getContainerElement } from "@excalidraw/element/textElement";
+import { getContainerElement } from "@excalidraw/element";
-import { detectLineHeight } from "@excalidraw/element/textMeasurements";
+import { detectLineHeight } from "@excalidraw/element";
 import {
   isArrowBoundToElement,
   isArrowElement,
@@ -37,15 +37,15 @@ import {
   isLineElement,
   isTextElement,
   isUsingAdaptiveRadius,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
 
-import { syncInvalidIndices } from "@excalidraw/element/fractionalIndex";
+import { syncInvalidIndices } from "@excalidraw/element";
 
-import { refreshTextDimensions } from "@excalidraw/element/newElement";
+import { refreshTextDimensions } from "@excalidraw/element";
 
-import { getNormalizedDimensions } from "@excalidraw/element/sizeHelpers";
+import { getNormalizedDimensions } from "@excalidraw/element";
 
-import { isInvisiblySmallElement } from "@excalidraw/element/sizeHelpers";
+import { isInvisiblySmallElement } from "@excalidraw/element";
 
 import type { LocalPoint, Radians } from "@excalidraw/math";
 

packages/excalidraw/data/transform.ts

@@ -16,7 +16,7 @@ import {
   getLineHeight,
 } from "@excalidraw/common";
 
-import { bindLinearElement } from "@excalidraw/element/binding";
+import { bindLinearElement } from "@excalidraw/element";
 import {
   newArrowElement,
   newElement,
@@ -25,24 +25,21 @@ import {
   newLinearElement,
   newMagicFrameElement,
   newTextElement,
-} from "@excalidraw/element/newElement";
+} from "@excalidraw/element";
-import {
+import { measureText, normalizeText } from "@excalidraw/element";
-  measureText,
+import { isArrowElement } from "@excalidraw/element";
-  normalizeText,
-} from "@excalidraw/element/textMeasurements";
-import { isArrowElement } from "@excalidraw/element/typeChecks";
 
-import { syncInvalidIndices } from "@excalidraw/element/fractionalIndex";
+import { syncInvalidIndices } from "@excalidraw/element";
 
-import { redrawTextBoundingBox } from "@excalidraw/element/textElement";
+import { redrawTextBoundingBox } from "@excalidraw/element";
 
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { LinearElementEditor } from "@excalidraw/element";
 
-import { getCommonBounds } from "@excalidraw/element/bounds";
+import { getCommonBounds } from "@excalidraw/element";
 
-import Scene from "@excalidraw/element/Scene";
+import { Scene } from "@excalidraw/element";
 
-import type { ElementConstructorOpts } from "@excalidraw/element/newElement";
+import type { ElementConstructorOpts } from "@excalidraw/element";
 
 import type {
   ExcalidrawArrowElement,