From 297a6aa95c1433aded2daa3aeb458797220ce185 Mon Sep 17 00:00:00 2001 From: Eugene Fox Date: Wed, 7 May 2025 00:05:12 +0300 Subject: [PATCH] feat: allow to create any group on firefox --- .../collections/CollectionMoreButton.tsx | 25 +++---------------- .../components/collections/GroupMoreMenu.tsx | 8 +++--- locales/en.yml | 1 - locales/pt_BR.yml | 1 - locales/ru.yml | 1 - locales/uk.yml | 1 - 6 files changed, 6 insertions(+), 31 deletions(-) diff --git a/entrypoints/sidepanel/components/collections/CollectionMoreButton.tsx b/entrypoints/sidepanel/components/collections/CollectionMoreButton.tsx index e944691..ec35684 100644 --- a/entrypoints/sidepanel/components/collections/CollectionMoreButton.tsx +++ b/entrypoints/sidepanel/components/collections/CollectionMoreButton.tsx @@ -19,7 +19,6 @@ export default function CollectionMoreButton({ onAddSelected }: CollectionMoreBu const GroupIcon = ic.bundleIcon(ic.GroupList20Filled, ic.GroupList20Regular); const EditIcon = ic.bundleIcon(ic.Edit20Filled, ic.Edit20Regular); const DeleteIcon = ic.bundleIcon(ic.Delete20Filled, ic.Delete20Regular); - const PinnedIcon = ic.bundleIcon(ic.Pin20Filled, ic.Pin20Regular); const BookmarkIcon = ic.bundleIcon(ic.BookmarkAdd20Filled, ic.BookmarkAdd20Regular); const dangerCls = useDangerStyles(); @@ -54,17 +53,6 @@ export default function CollectionMoreButton({ onAddSelected }: CollectionMoreBu onSave={ group => updateCollection({ ...collection, items: [...collection.items, group] }, collectionIndex) } /> ); - const handleAddPinnedGroup = () => - { - updateCollection({ - ...collection, - items: [ - { type: "group", pinned: true, items: [] }, - ...collection.items - ] - }, collectionIndex); - }; - return ( @@ -80,16 +68,9 @@ export default function CollectionMoreButton({ onAddSelected }: CollectionMoreBu { i18n.t("collections.menu.add_selected") } } - { !import.meta.env.FIREFOX && - } onClick={ handleCreateGroup }> - { i18n.t("collections.menu.add_group") } - - } - { (import.meta.env.FIREFOX && !hasPinnedGroup) && - } onClick={ handleAddPinnedGroup }> - { i18n.t("collections.menu.add_pinned") } - - } + } onClick={ handleCreateGroup }> + { i18n.t("collections.menu.add_group") } + { tabCount > 0 && } onClick={ () => exportCollectionToBookmarks(collection) }> { i18n.t("collections.menu.export_bookmarks") } diff --git a/entrypoints/sidepanel/components/collections/GroupMoreMenu.tsx b/entrypoints/sidepanel/components/collections/GroupMoreMenu.tsx index 8280582..abb23f4 100644 --- a/entrypoints/sidepanel/components/collections/GroupMoreMenu.tsx +++ b/entrypoints/sidepanel/components/collections/GroupMoreMenu.tsx @@ -77,11 +77,9 @@ export default function GroupMoreMenu(): ReactElement { i18n.t("groups.menu.add_selected") } - { (!import.meta.env.FIREFOX || group.pinned !== true) && - } onClick={ handleEdit }> - { i18n.t("groups.menu.edit") } - - } + } onClick={ handleEdit }> + { i18n.t("groups.menu.edit") } + { group.items.length > 0 &&