@@ -112,10 +112,10 @@ const selectedSorting = computed({
112112
113113watch (() => route .fullPath , () => {
114114 searchQuery .value = route .query .search as string ?? null ;
115- itemsSorting .value = route .query .sorting as string ?? null ;
116- pageSize .value = isNaN (route .query .pageSize ) ? parseInt (route .query .pageSize ) : defaultPageSize ;
117- currentPage .value = isNaN (route .query .page ) ? parseInt (route .query .page ) : 1 ;
118- layout .value = route .query .layout as string ?? null ;
115+ itemsSorting .value = route .query .sorting as string ?? sortingOptions [ 0 ]. value ;
116+ pageSize .value = isNaN (route .query .pageSize ) ? defaultPageSize : parseInt (route .query .pageSize );
117+ currentPage .value = isNaN (route .query .page ) ? 1 : parseInt (route .query .page );
118+ layout .value = route .query .layout as string ?? " default " ;
119119
120120 // Ensure categoryFilters is always an array of strings
121121 categoryFilters .value = Array .isArray (route .query .categoryFilters )
@@ -132,7 +132,7 @@ watch([searchQuery, itemsSorting, pageSize, currentPage, layout, categoryFilters
132132 router .push ({
133133 query: {
134134 search: searchQuery .value ,
135- sorting: itemsSorting .value ,
135+ sorting: itemsSorting .value ? itemsSorting . value : sortingOptions [ 0 ]. value ,
136136 pageSize: pageSize .value ,
137137 page: currentPage .value ,
138138 layout: layout .value ,
@@ -146,10 +146,10 @@ watch([searchQuery, itemsSorting, pageSize, currentPage, layout, categoryFilters
146146
147147onActivated (() => {
148148 searchQuery .value = route .query .search as string ?? null ;
149- itemsSorting .value = route .query .sorting as string ?? null ;
149+ itemsSorting .value = route .query .sorting as string ?? sortingOptions [ 0 ]. value ;
150150 pageSize .value = route .query .pageSize as number ?? defaultPageSize ;
151151 currentPage .value = route .query .page as number ?? 1 ;
152- layout .value = route .query .layout as string ?? null ;
152+ layout .value = route .query .layout as string ?? " default " ;
153153 categoryFilters .value = route .query .categoryFilters as string [] ?? null ;
154154 tagFilters .value = route .query .tagFilters as string [] ?? null ;
155155});
0 commit comments