🎥 Make videos programmatically with React
Merge remote-tracking branch 'origin/main' into feature/compositions-order
Jonny Burger1cd1ea624c23
diff --cc packages/studio/src/helpers/create-folder-tree.tsindex d138125d24,0444c6985a..78df63f5bf--- a/packages/studio/src/helpers/create-folder-tree.ts+++ b/packages/studio/src/helpers/create-folder-tree.ts@@@ -236,34 -237,26 +237,55 @@@ export const createFolderTree =list.push(toPush);}- return items;+ const sortTreeItems = (+ treeItems: CompositionSelectorItemType[],+ ): CompositionSelectorItemType[] => {+ return sortItemsByNonceHistory(+ treeItems.map((item) => ({+ item,+ nonce:+ item.type === 'folder' ? item.folder.nonce : item.composition.nonce,+ })),+ ).map(({item}) => {+ if (item.type === 'composition') {+ return item;+ }++ return {+ ...item,+ items: sortTreeItems(item.items),+ };+ });+ };++ return sortTreeItems(items);};++/**+ * Sorts the tree returned by createFolderTree by name, on every level.+ * Folders stay above compositions like they do in registration order - only+ * the order within each of the two groups changes.+ */+export const sortFolderTreeAlphabetically = (+ items: CompositionSelectorItemType[],+): CompositionSelectorItemType[] => {+ return items+ .map((item) => {+ if (item.type !== 'folder') {+ return item;+ }++ return {...item, items: sortFolderTreeAlphabetically(item.items)};+ })+ .sort((a, b) => {+ if (a.type !== b.type) {+ return a.type === 'folder' ? -1 : 1;+ }++ const aName = a.type === 'folder' ? a.folderName : a.composition.id;+ const bName = b.type === 'folder' ? b.folderName : b.composition.id;++ // `numeric` so that Scene2 comes before Scene10.+ return aName.localeCompare(bName, undefined, {numeric: true});+ });+};