@ndla/ui 27.1.2 → 27.1.4

package/src/TreeStructure/ComboboxButton.tsx

@@ -53,12 +53,12 @@ interface Props {
   label?: string;
   focusedFolder?: FolderType;
   selectedFolder?: FolderType;
-  setSelectedFolder: (folder?: FolderType) => void;
+  setSelectedFolder: (folder: FolderType) => void;
   onToggleTree: (open: boolean) => void;
   flattenedFolders: FolderType[];
   onOpenFolder: (id: string) => void;
   onCloseFolder: (id: string) => void;
-  setFocusedFolder: (folder?: FolderType) => void;
+  setFocusedFolder: (folder: FolderType) => void;
 }
 
 const ComboboxButton = forwardRef<HTMLButtonElement, Props>(
@@ -82,7 +82,7 @@ const ComboboxButton = forwardRef<HTMLButtonElement, Props>(
 
     const onKeyDown = (e: KeyboardEvent<HTMLButtonElement>) => {
       if (e.key === 'Enter') {
-        if (showTree) {
+        if (showTree && focusedFolder) {
           setSelectedFolder(focusedFolder);
         }
         return;

package/src/TreeStructure/FolderItem.tsx

@@ -117,7 +117,6 @@ const FolderItem = ({
   selectedFolder,
   onCloseFolder,
   onOpenFolder,
-  onSelectFolder,
   setFocusedFolder,
   setSelectedFolder,
   targetResource,
@@ -143,7 +142,6 @@ const FolderItem = ({
       if (selected) {
         closeTree();
       }
-      onSelectFolder?.(id);
     }
   };
 
@@ -193,7 +191,7 @@ const FolderItem = ({
       selected={selected}
       onFocus={() => setFocusedFolder(folder)}
       onClick={handleClickFolder}>
-      {(!hideArrow || level === 0) && (
+      {!hideArrow && (
         <OpenButton
           aria-hidden
           tabIndex={-1}

package/src/TreeStructure/TreeStructure.tsx

@@ -81,6 +81,7 @@ export interface TreeStructureProps extends CommonTreeStructureProps {
   label?: string;
   maxLevel?: number;
   newFolderInput?: NewFolderInputFunc;
+  onSelectFolder?: (id: string) => void;
 }
 
 const TreeStructure = ({
@@ -101,8 +102,8 @@ const TreeStructure = ({
   const [openFolders, setOpenFolders] = useState<string[]>(defaultOpenFolders || []);
 
   const [newFolderParentId, setNewFolderParentId] = useState<string | undefined>();
-  const [focusedFolder, setFocusedFolder] = useState<FolderType | undefined>();
-  const [selectedFolder, setSelectedFolder] = useState<FolderType | undefined>();
+  const [focusedFolder, _setFocusedFolder] = useState<FolderType | undefined>();
+  const [selectedFolder, _setSelectedFolder] = useState<FolderType | undefined>();
   const [showTree, setShowTree] = useState(type === 'navigation');
 
   const flattenedFolders = useMemo(() => flattenFolders(folders, openFolders), [folders, openFolders]);
@@ -122,9 +123,9 @@ const TreeStructure = ({
     if (defaultSelectedFolderId !== undefined) {
       const selected = flattenFolders(folders).find((folder) => folder.id === defaultSelectedFolderId);
       if (selected) {
-        setSelectedFolder(selected);
+        _setSelectedFolder(selected);
         if (type === 'picker') {
-          setFocusedFolder(selected);
+          _setFocusedFolder(selected);
         }
       }
     }
@@ -138,6 +139,22 @@ const TreeStructure = ({
     }
   };
 
+  const setSelectedFolder = (folder: FolderType) => {
+    _setSelectedFolder(folder);
+    onSelectFolder?.(folder.id);
+  };
+
+  const setFocusedFolder = (folder: FolderType) => {
+    _setFocusedFolder(folder);
+    setNewFolderParentId(undefined);
+
+    ref.current?.focus();
+  };
+
+  const onOpenFolder = (id: string) => {
+    setOpenFolders(uniq(openFolders.concat(id)));
+  };
+
   const onCloseFolder = (id: string) => {
     const closedFolder = flattenedFolders.find((folder) => folder.id === id);
 
@@ -150,14 +167,9 @@ const TreeStructure = ({
     setOpenFolders(openFolders.filter((folderId) => folderId !== id));
   };
 
-  const onOpenFolder = (id: string) => {
-    setOpenFolders(uniq(openFolders.concat(id)));
-  };
-
   const onNewFolderCreated = (newFolder: IFolder | undefined, parentId: string) => {
     if (newFolder) {
       setSelectedFolder(newFolder);
-      onSelectFolder?.(newFolder.id);
       setFocusedFolder(newFolder);
       setOpenFolders(uniq(openFolders.concat(parentId)));
       setNewFolderParentId?.(undefined);
@@ -170,11 +182,6 @@ const TreeStructure = ({
     ref.current?.focus();
   };
 
-  const setFolderFocus = (folder: FolderType) => {
-    setFocusedFolder(folder);
-    setNewFolderParentId(undefined);
-    ref.current?.focus();
-  };
   const canAddFolder = showTree && selectedFolder && selectedFolder?.breadcrumbs.length < (maxLevel || 1);
 
   return (
@@ -224,9 +231,8 @@ const TreeStructure = ({
               onCancelNewFolder={onCancelNewFolder}
               onCloseFolder={onCloseFolder}
               onOpenFolder={onOpenFolder}
-              onSelectFolder={onSelectFolder}
               openFolders={openFolders}
-              setFocusedFolder={setFolderFocus}
+              setFocusedFolder={setFocusedFolder}
               setSelectedFolder={setSelectedFolder}
               targetResource={targetResource}
               visibleFolders={flattenedFolders}

package/src/TreeStructure/index.ts

@@ -7,6 +7,6 @@
  */
 
 import TreeStructure from './TreeStructure';
-export type { FolderType, TreeStructureMenuProps } from './types';
+export type { FolderType } from './types';
 export type { TreeStructureProps } from './TreeStructure';
 export { TreeStructure };

package/src/TreeStructure/types.ts

@@ -6,9 +6,8 @@
  *
  */
 
-import { MouseEvent, ReactNode } from 'react';
+import { ReactNode } from 'react';
 import { IFolder, IResource } from '@ndla/types-learningpath-api';
-import { MenuItemProps } from '@ndla/button';
 
 export interface FolderType extends IFolder {
   icon?: ReactNode;
@@ -29,13 +28,8 @@ export type NewFolderInputFunc = ({
   onCreate: OnCreatedFunc;
 }) => ReactNode;
 
-export interface TreeStructureMenuProps extends Omit<MenuItemProps, 'onClick'> {
-  onClick: (e: MouseEvent<HTMLDivElement> | undefined, folder: FolderType) => void;
-}
-
 export interface CommonTreeStructureProps {
   loading?: boolean;
-  onSelectFolder?: (id: string) => void;
   targetResource?: IResource;
   type: TreeStructureType;
 }

package/src/index.ts

@@ -252,6 +252,6 @@ export { SnackbarProvider, useSnack, BaseSnack, DefaultSnackbar } from './SnackB
 export type { Snack, SnackContext } from './SnackBar';
 export { InfoBlock } from './InfoBlock';
 export { TreeStructure } from './TreeStructure';
-export type { FolderType, TreeStructureProps, TreeStructureMenuProps } from './TreeStructure';
+export type { FolderType, TreeStructureProps } from './TreeStructure';
 
 export { SearchField, SearchResultList, SearchResultItem, ActiveFilters, ToggleSearchButton } from './Search';

package/src/locale/messages-se.ts

@@ -997,16 +997,16 @@ const messages = {
     folder: {
       folder: 'Máhppa',
       delete: 'Sihko',
-      edit: 'Redigere',
+      edit: 'Rievdat',
       missingName: 'Čále nama máhppii',
       folderDeleted: '"{{folderName}}" lea sihkkojuvvon',
       folderCreated: '"{{folderName}}" er oppretta',
     },
-    tagList: 'Emneknagger',
+    tagList: 'Fáddágilkor',
     tags: '{{count}} fáddágilkor',
     tags_plural: '{{count}} fáddágilkorat',
-    moreTags: 'Vis ein emneknagg til',
-    moreTags_plural: 'Vis {{count}} emneknaggar til',
+    moreTags: 'Čájet nuppi fáddágilkora vel',
+    moreTags_plural: 'Čájet {{count}}  fáddágilkoriid vel',
     confirmDeleteFolder: 'Leat go áibbas sihkar ahte dáhtut sihkkut máhpa? Dan ii sáhte gáhtat.',
     confirmDeleteTag: 'Leat go áibbas sihkar ahte dáhtut sihkkut fáddágilkora? Dan ii sáhte gáhtat.',
     myFolders: 'Mu máhpat',
@@ -1031,8 +1031,8 @@ const messages = {
       deleteAccount: 'Sihko mu NDLA',
       logout: 'Logge eret mu NDLAs',
       loginText:
-        'For å kunne bruke tjenesten Min NDLA må du vere elev eller jobbe på ein skule i eit fylke som er med i NDLA-samarbeidet. Vi ber om at du ikkje skriv noko støtande, personsensitiv informasjon eller andre persondata i tekstfelt. Les vår ',
-      loginTextLink: 'personvernerklæring her',
+        'Jus galggat sáhttit geavahit bálvalusa Mu NDLA fertet leat oahppi dahje bargat muhtin skuvllas fylkkas mii lea mielde NDLA-ovttasbarggus. Mii bivdit ahte it čále maidege unohasaid, persovdnasensitiivvalaš dieđuid dahje eará persovdnadáhtaid min teakstagieddái. Loga min ',
+      loginTextLink: 'personsuodjalusjulggaštusa dákko',
       loginTerms: 'Logge Feide bokte vai oaččut beassanlobi. Go logget sisa de dohkkehat min geavahaneavttuid.',
       loginResourcePitch: 'Dáhtut go merket siiddu oiddohin?',
       loginWelcome: 'Bures boahtin NDLA:ii! Dáppe sáhtát fágaávdnasiid ordnet iežat vuogi mielde',