@@ -27,7 +27,7 @@ import {
2727} from "@webstudio-is/icons" ;
2828import { ExtendedPanel } from "../../shared/extended-sidebar-panel" ;
2929import { NewPageSettings , PageSettings } from "./page-settings" ;
30- import { $editingPageId , $pages , $selectedPageId } from "~/shared/nano-states" ;
30+ import { $editingPageId , $pages } from "~/shared/nano-states" ;
3131import { switchPage } from "~/shared/pages" ;
3232import {
3333 getAllChildrenAndSelf ,
@@ -50,6 +50,7 @@ import {
5050import { atom , computed } from "nanostores" ;
5151import { isPathnamePattern } from "~/builder/shared/url-pattern" ;
5252import { updateWebstudioData } from "~/shared/instance-utils" ;
53+ import { $selectedPage } from "~/shared/awareness" ;
5354
5455const ItemSuffix = ( {
5556 isParentSelected,
@@ -439,7 +440,7 @@ const PageEditor = ({
439440 editingPageId : string ;
440441 onClose : ( ) => void ;
441442} ) => {
442- const currentPageId = useStore ( $selectedPageId ) ;
443+ const currentPage = useStore ( $selectedPage ) ;
443444
444445 if ( editingPageId === newPageId ) {
445446 return (
@@ -459,7 +460,7 @@ const PageEditor = ({
459460 onDelete = { ( ) => {
460461 onClose ( ) ;
461462 // switch to home page when deleted currently selected page
462- if ( editingPageId === currentPageId ) {
463+ if ( editingPageId === currentPage ?. id ) {
463464 const pages = $pages . get ( ) ;
464465 if ( pages ) {
465466 switchPage ( pages . homePage . id ) ;
@@ -504,11 +505,11 @@ const FolderEditor = ({
504505} ;
505506
506507export const PagesPanel = ( { onClose } : { onClose : ( ) => void } ) => {
507- const currentPageId = useStore ( $selectedPageId ) ;
508+ const currentPage = useStore ( $selectedPage ) ;
508509 const editingItemId = useStore ( $editingPageId ) ;
509510 const pages = useStore ( $pages ) ;
510511
511- if ( currentPageId === undefined || pages === undefined ) {
512+ if ( currentPage === undefined || pages === undefined ) {
512513 return ;
513514 }
514515
@@ -557,7 +558,7 @@ export const PagesPanel = ({ onClose }: { onClose: () => void }) => {
557558 < Separator />
558559
559560 < PagesTree
560- selectedPageId = { currentPageId }
561+ selectedPageId = { currentPage . id }
561562 onSelect = { ( itemId ) => {
562563 switchPage ( itemId ) ;
563564 onClose ( ) ;
@@ -566,7 +567,7 @@ export const PagesPanel = ({ onClose }: { onClose: () => void }) => {
566567 onEdit = { ( itemId ) => {
567568 // always select page when edit its settings
568569 if ( itemId && isFolder ( itemId , pages . folders ) === false ) {
569- $selectedPageId . set ( itemId ) ;
570+ switchPage ( itemId ) ;
570571 }
571572 $editingPageId . set ( itemId ) ;
572573 } }
0 commit comments