@ndla/ui 30.0.7 → 30.0.9

package/src/TagSelector/TagSelector.tsx

@@ -68,7 +68,15 @@ interface Props {
   labelHidden?: boolean;
 }
 
-const TagSelector = ({ selected: _selected, tags: _tags, onChange, onCreateTag, className, label }: Props) => {
+const TagSelector = ({
+  selected: _selected,
+  tags: _tags,
+  onChange,
+  onCreateTag,
+  className,
+  label,
+  labelHidden,
+}: Props) => {
   const { t } = useTranslation();
   const [input, setInput] = useState('');
   const tags = useMemo(() => _tags.map((tag) => ({ value: tag, label: tag })), [_tags]);
@@ -93,7 +101,7 @@ const TagSelector = ({ selected: _selected, tags: _tags, onChange, onCreateTag,
   return (
     <StyledTagSelector className={className}>
       {label && (
-        <StyledLabel labelHidden htmlFor="tagselector-creatable" id="tagselector-label">
+        <StyledLabel labelHidden={labelHidden} htmlFor="tagselector-creatable" id="tagselector-label">
           {label}
         </StyledLabel>
       )}

package/src/index.ts

@@ -24,7 +24,6 @@ export {
   ArticleHeaderWrapper,
   ArticleSideBar,
   default as Article,
-  ArticleFavoritesButton,
 } from './Article';
 
 export { CompetenceGoalsDialog } from './CompetenceGoals';

package/src/locale/messages-en.ts

@@ -1065,7 +1065,8 @@ const messages = {
     favourites: 'Favourites',
     addToFavourites: 'Add to my favourites',
     alreadyFavourited: 'Already in my favourites',
-    alreadyInFolder: 'Already in folder',
+    alreadyInFolder: 'Already in folder. You can still save new tags.',
+    noFolderSelected: 'Select or create a new folder to save the resource.',
     help: 'Help',
     more: 'More options',
     listView: 'List view',

package/src/locale/messages-nb.ts

@@ -1062,14 +1062,16 @@ const messages = {
     favourites: 'Favoritter',
     addToFavourites: 'Legg til i mine favoritter',
     alreadyFavourited: 'Allerede lagt til i mine favoritter',
-    alreadyInFolder: 'Finnes allerede i mappen',
+    alreadyInFolder: 'Finnes allerede i mappen. Du kan fortsatt lagre nye emneknagger.',
+    noFolderSelected: 'Velg eller opprett ny mappe for å lagre ressursen',
     help: 'Hjelp',
     more: 'Flere valg',
     listView: 'Listevisning',
     detailView: 'Detaljert listevisning',
     shortView: 'Kort visning',
     myPage: {
-      imageAlt: 'Halvnært bilde av jente som holder et nettbrett i hendene. Oppå nettbrettet ligger det ei samling fargeprøver i ulike former og farger. Grafikk.',
+      imageAlt:
+        'Halvnært bilde av jente som holder et nettbrett i hendene. Oppå nettbrettet ligger det ei samling fargeprøver i ulike former og farger. Grafikk.',
       confirmDeleteAccount: 'Er du sikker på at du vil slette kontoen?',
       confirmDeleteAccountButton: 'Slett konto',
       myPage: 'Min side',

package/src/locale/messages-nn.ts

@@ -1063,7 +1063,8 @@ const messages = {
     favourites: 'Favorittar',
     addToFavourites: 'Legg til i mine favorittar',
     alreadyFavourited: 'Allereie lagt til i mine favorittar',
-    alreadyInFolder: 'Finst allereie i mappa',
+    alreadyInFolder: 'Finst allereie i mappa. Du kan fortsatt lagre nye emneknaggar.',
+    noFolderSelected: 'Velg eller opprett ny mappe for å lagre ressursen',
     help: 'Hjelp',
     more: 'Fleire val',
     listView: 'Listevisning',

package/src/locale/messages-se.ts

@@ -1063,7 +1063,8 @@ const messages = {
     favourites: 'Oiddohat',
     addToFavourites: 'Bija mu oiddohiid searvái',
     alreadyFavourited: 'Lea juo biddjon oiddohin',
-    alreadyInFolder: 'Gávdno juo máhpas',
+    alreadyInFolder: 'Finnes allerede i mappen. Du kan fortsatt lagre nye emneknagger.',
+    noFolderSelected: 'Velg eller opprett ny mappe for å lagre ressursen',
     help: 'Veahkki',
     more: 'Eanet válljejumit',
     listView: 'Oppalašlistu',

package/src/locale/messages-sma.ts

@@ -1064,7 +1064,8 @@ const messages = {
     favourites: 'Favoritter',
     addToFavourites: 'Legg til i mine favoritter',
     alreadyFavourited: 'Allerede lagt til i mine favoritter',
-    alreadyInFolder: 'Finnes allerede i mappen',
+    alreadyInFolder: 'Finnes allerede i mappen. Du kan fortsatt lagre nye emneknagger.',
+    noFolderSelected: 'Velg eller opprett ny mappe for å lagre ressursen',
     help: 'Hjelp',
     more: 'Flere valg',
     listView: 'Listevisning',

package/es/Article/ArticleFavoritesButton.js

@@ -1,42 +0,0 @@
-import { jsx as _jsx } from "@emotion/react/jsx-runtime";
-
-/**
- * Copyright (c) 2022-present, NDLA.
- *
- * This source code is licensed under the GPLv3 license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-import React from 'react';
-import { IconButtonDualStates } from '@ndla/button';
-import { Heart, HeartOutline } from '@ndla/icons/action';
-import Tooltip from '@ndla/tooltip';
-import { useTranslation } from 'react-i18next';
-export var ArticleFavoritesButton = function ArticleFavoritesButton(_ref) {
-  var isFavorite = _ref.isFavorite,
-      onToggleAddToFavorites = _ref.onToggleAddToFavorites,
-      articleId = _ref.articleId;
-
-  var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
-  var removeFromFavoritesLabel = t('myNdla.resource.addToMyNdla');
-  var addToFavoritesLabel = t('myNdla.resource.addedToMyNdla');
-  return _jsx(Tooltip, {
-    tooltip: isFavorite ? addToFavoritesLabel : removeFromFavoritesLabel,
-    children: _jsx(IconButtonDualStates, {
-      ariaLabelActive: t('myNdla.alreadyFavourited'),
-      ariaLabelInActive: t('myNdla.addToFavourites'),
-      activeIcon: _jsx(Heart, {}),
-      inactiveIcon: _jsx(HeartOutline, {}),
-      active: isFavorite,
-      size: "small",
-      colorTheme: "light",
-      variant: "ghost",
-      onClick: function onClick() {
-        return onToggleAddToFavorites(articleId, !isFavorite);
-      }
-    })
-  });
-};
-export default ArticleFavoritesButton;

package/lib/Article/ArticleFavoritesButton.d.ts

@@ -1,14 +0,0 @@
-/**
- * Copyright (c) 2022-present, NDLA.
- *
- * This source code is licensed under the GPLv3 license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-export interface Props {
-    isFavorite?: boolean;
-    onToggleAddToFavorites: (id: string, add: boolean) => void;
-    articleId: string;
-}
-export declare const ArticleFavoritesButton: ({ isFavorite, onToggleAddToFavorites, articleId }: Props) => import("@emotion/react/types/jsx-namespace").EmotionJSX.Element;
-export default ArticleFavoritesButton;

package/lib/Article/ArticleFavoritesButton.js

@@ -1,59 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = exports.ArticleFavoritesButton = void 0;
-
-var _jsxRuntime = require("@emotion/react/jsx-runtime");
-
-var _react = _interopRequireDefault(require("react"));
-
-var _button = require("@ndla/button");
-
-var _action = require("@ndla/icons/action");
-
-var _tooltip = _interopRequireDefault(require("@ndla/tooltip"));
-
-var _reactI18next = require("react-i18next");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-/**
- * Copyright (c) 2022-present, NDLA.
- *
- * This source code is licensed under the GPLv3 license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-var ArticleFavoritesButton = function ArticleFavoritesButton(_ref) {
-  var isFavorite = _ref.isFavorite,
-      onToggleAddToFavorites = _ref.onToggleAddToFavorites,
-      articleId = _ref.articleId;
-
-  var _useTranslation = (0, _reactI18next.useTranslation)(),
-      t = _useTranslation.t;
-
-  var removeFromFavoritesLabel = t('myNdla.resource.addToMyNdla');
-  var addToFavoritesLabel = t('myNdla.resource.addedToMyNdla');
-  return (0, _jsxRuntime.jsx)(_tooltip["default"], {
-    tooltip: isFavorite ? addToFavoritesLabel : removeFromFavoritesLabel,
-    children: (0, _jsxRuntime.jsx)(_button.IconButtonDualStates, {
-      ariaLabelActive: t('myNdla.alreadyFavourited'),
-      ariaLabelInActive: t('myNdla.addToFavourites'),
-      activeIcon: (0, _jsxRuntime.jsx)(_action.Heart, {}),
-      inactiveIcon: (0, _jsxRuntime.jsx)(_action.HeartOutline, {}),
-      active: isFavorite,
-      size: "small",
-      colorTheme: "light",
-      variant: "ghost",
-      onClick: function onClick() {
-        return onToggleAddToFavorites(articleId, !isFavorite);
-      }
-    })
-  });
-};
-
-exports.ArticleFavoritesButton = ArticleFavoritesButton;
-var _default = ArticleFavoritesButton;
-exports["default"] = _default;

package/src/Article/ArticleFavoritesButton.tsx

@@ -1,42 +0,0 @@
-/**
- * Copyright (c) 2022-present, NDLA.
- *
- * This source code is licensed under the GPLv3 license found in the
- * LICENSE file in the root directory of this source tree.
- *
- */
-
-import React from 'react';
-import { IconButtonDualStates } from '@ndla/button';
-import { Heart, HeartOutline } from '@ndla/icons/action';
-import Tooltip from '@ndla/tooltip';
-import { useTranslation } from 'react-i18next';
-
-export interface Props {
-  isFavorite?: boolean;
-  onToggleAddToFavorites: (id: string, add: boolean) => void;
-  articleId: string;
-}
-
-export const ArticleFavoritesButton = ({ isFavorite, onToggleAddToFavorites, articleId }: Props) => {
-  const { t } = useTranslation();
-  const removeFromFavoritesLabel = t('myNdla.resource.addToMyNdla');
-  const addToFavoritesLabel = t('myNdla.resource.addedToMyNdla');
-  return (
-    <Tooltip tooltip={isFavorite ? addToFavoritesLabel : removeFromFavoritesLabel}>
-      <IconButtonDualStates
-        ariaLabelActive={t('myNdla.alreadyFavourited')}
-        ariaLabelInActive={t('myNdla.addToFavourites')}
-        activeIcon={<Heart />}
-        inactiveIcon={<HeartOutline />}
-        active={isFavorite}
-        size="small"
-        colorTheme="light"
-        variant="ghost"
-        onClick={() => onToggleAddToFavorites(articleId, !isFavorite)}
-      />
-    </Tooltip>
-  );
-};
-
-export default ArticleFavoritesButton;