Merge branch 'master' into windows-ci

mui · Sep 6, 2023 · 486b45b · 486b45b
2 parents 6ef6daa + 00b1f37
commit 486b45b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/docs/data/pages.ts b/docs/data/pages.ts
@@ -10,6 +10,7 @@ const pages: MuiPage[] = [
  { pathname: '/toolpad/getting-started/first-app', title: 'Build your first app' },
  {
  pathname: '/toolpad/examples-group',
+ title: 'Examples',
  children: [
  { pathname: '/toolpad/examples', title: 'Overview' },
  { pathname: '/toolpad/examples/npm-stats', title: 'npm stats' },

diff --git a/packages/toolpad-app/src/toolpad/AppEditor/HierarchyExplorer/index.tsx b/packages/toolpad-app/src/toolpad/AppEditor/HierarchyExplorer/index.tsx
@@ -13,11 +13,12 @@ import { useNodeNameValidation } from '../PagesExplorer/validation';
 import { DomView } from '../../../utils/domView';
 import { removePageLayoutNode } from '../pageLayout';
 
-function CustomTreeItem(
- props: TreeItemProps & {
- node: appDom.ElementNode;
- },
-) {
+export interface CustomTreeItemProps extends TreeItemProps {
+ ref?: React.RefObject<HTMLLIElement>;
+ node: appDom.ElementNode;
+}
+
+function CustomTreeItem(props: CustomTreeItemProps) {
  const domApi = useDomApi();
  const { dom } = useDom();
  const appStateApi = useAppStateApi();

diff --git a/packages/toolpad-app/src/toolpad/AppEditor/PagesExplorer/index.tsx b/packages/toolpad-app/src/toolpad/AppEditor/PagesExplorer/index.tsx
@@ -39,7 +39,8 @@ const StyledTreeItem = styled(TreeItem)({
  },
 });
 
-type StyledTreeItemProps = TreeItemProps & {
+interface StyledTreeItemProps extends TreeItemProps {
+ ref?: React.RefObject<HTMLLIElement>;
  onDeleteNode?: (nodeId: NodeId) => void;
  onDuplicateNode?: (nodeId: NodeId) => void;
  onCreate?: React.MouseEventHandler;
@@ -49,7 +50,7 @@ type StyledTreeItemProps = TreeItemProps & {
  deleteLabelText?: string;
  duplicateLabelText?: string;
  toolpadNodeId?: NodeId;
-};
+}
 
 function PagesExplorerTreeItem(props: StyledTreeItemProps) {
  const {

diff --git a/packages/toolpad-app/src/toolpadDataSources/local/client.tsx b/packages/toolpad-app/src/toolpadDataSources/local/client.tsx
@@ -192,7 +192,7 @@ function QueryEditor({
  [setSelectedHandler],
  );
 
- const handlerTreeRef = React.useRef<HTMLDivElement>(null);
+ const handlerTreeRef = React.useRef<HTMLUListElement>(null);
 
  React.useEffect(() => {
  handlerTreeRef.current?.querySelector(`.${treeItemClasses.selected}`)?.scrollIntoView();