@ndla/ui 22.3.0 → 24.1.0

package/src/TreeStructure/FolderNameInput.tsx

@@ -14,6 +14,9 @@ import { spacing, colors, misc, animations } from '@ndla/core';
 import { useTranslation } from 'react-i18next';
 import { isMobile } from 'react-device-detect';
 import { Spinner } from '@ndla/icons';
+import { IconButton } from '@ndla/button';
+import { Cross } from '@ndla/icons/action';
+import { Done } from '@ndla/icons/editor';
 
 const ArrowRight = styled(ArrowDropDownRaw)`
   color: ${colors.text.primary};
@@ -29,15 +32,19 @@ const NewFolderWrapper = styled.div`
   }
 `;
 
+const Row = styled.div`
+  display: flex;
+  gap: ${spacing.xxsmall};
+  padding-right: ${spacing.xsmall};
+`;
+
 const InputWrapper = styled.div<{ loading?: boolean }>`
-  margin: ${spacing.xxsmall} ${spacing.small} ${spacing.xxsmall} 0;
   display: flex;
+  margin: ${spacing.xxsmall} 0;
   align-items: center;
   border: 1px solid ${({ loading }) => (loading ? colors.brand.lighter : colors.brand.primary)};
   border-style: dashed;
   border-radius: ${misc.borderRadius};
-  padding-right: ${spacing.normal};
-  padding-left: ${spacing.xsmall};
   color: ${colors.brand.primary};
 `;
 
@@ -45,8 +52,7 @@ const StyledInput = styled.input`
   flex-grow: 1;
   border: 0;
   outline: none;
-  padding: ${spacing.small};
-  padding-left: ${spacing.xsmall};
+  min-width: 0;
   background: transparent;
   color: ${colors.text.primary};
   scroll-margin-top: 100px;
@@ -74,15 +80,16 @@ const FolderNameInput = ({ onSaveNewFolder, parentId, onCancelNewFolder, loading
   return (
     <NewFolderWrapper>
       <InputWrapper loading={loading}>
-        <ArrowRight />
-        <FolderOutlined />
+        <Row>
+          <ArrowRight />
+          <FolderOutlined />
+        </Row>
         <StyledInput
           ref={inputRef}
           autoFocus
           placeholder={t('treeStructure.newFolder.placeholder')}
           disabled={loading}
           value={name}
-          onBlur={() => onCancelNewFolder()}
           onKeyDown={(e: KeyboardEvent<HTMLInputElement>) => {
             if (e.key === 'Escape') {
               onCancelNewFolder();
@@ -93,7 +100,24 @@ const FolderNameInput = ({ onSaveNewFolder, parentId, onCancelNewFolder, loading
           }}
           onChange={(e: ChangeEvent<HTMLInputElement>) => setName(e.target.value)}
         />
-        {loading && <Spinner size="small" />}
+        <Row>
+          {!loading ? (
+            <>
+              <IconButton aria-label={t('close')} size="xsmall" ghostPill onClick={onCancelNewFolder}>
+                <Cross />
+              </IconButton>
+              <IconButton
+                aria-label={t('save')}
+                size="xsmall"
+                ghostPill
+                onClick={() => onSaveNewFolder(name, parentId)}>
+                <Done />
+              </IconButton>
+            </>
+          ) : (
+            <Spinner size="small" margin="0" />
+          )}
+        </Row>
       </InputWrapper>
     </NewFolderWrapper>
   );

package/src/TreeStructure/types.ts

@@ -8,7 +8,7 @@
 
 import { MouseEvent, ReactNode } from 'react';
 import { IFolder, IResource } from '@ndla/types-learningpath-api';
-import { MenuItemProps } from '@ndla/button/src';
+import { MenuItemProps } from '@ndla/button';
 
 export interface FolderType extends IFolder {
   icon?: ReactNode;

package/src/all.scss

@@ -3,7 +3,6 @@
 @import './main';
 @import '~@ndla/tabs/scss/tabs';
 @import '~@ndla/core/scss/utilities';
-@import '~@ndla/audio-search/scss/audio-search';
 @import '~@ndla/video-search/scss/video-search';
 @import '~@ndla/button/src/all.scss';
 @import '~@ndla/tooltip/src/all.css';

package/src/index-javascript.js

@@ -8,21 +8,6 @@
 
 export { FilterList, FilterListPhone, FilterButtons } from './Filter';
 
-export {
-  SearchOverlay,
-  SearchField,
-  SearchPage,
-  SearchResult,
-  SearchResultAuthor,
-  SearchResultList,
-  SearchResultItem,
-  SearchFilter,
-  SearchFilterList,
-  SearchPopoverFilter,
-  ActiveFilters,
-  ToggleSearchButton,
-} from './Search';
-
 export { default as TopicIntroductionList } from './TopicIntroductionList';
 export { default as TopicMenu, TopicMenuButton } from './TopicMenu';
 export {

package/src/index.ts

@@ -245,3 +245,5 @@ export type { Snack, SnackContext } from './SnackBar';
 export { InfoBlock } from './InfoBlock';
 export { TreeStructure } from './TreeStructure';
 export type { FolderType, TreeStructureProps, TreeStructureMenuProps } from './TreeStructure';
+
+export { SearchField, SearchResultList, SearchResultItem, ActiveFilters, ToggleSearchButton } from './Search';

package/src/locale/messages-en.ts

@@ -1023,7 +1023,7 @@ const messages = {
     more: 'More options',
     listView: 'List view',
     detailView: 'Detailed listview',
-    shortView: 'Short view',
+    shortView: 'Card view',
     myPage: {
       confirmDeleteAccount: 'Are you sure you want to delete your account?',
       confirmDeleteAccountButton: 'Delete account',
@@ -1050,7 +1050,7 @@ const messages = {
 
       storageInfo: {
         title: 'How to save your favourite resources from NDLA',
-        text: 'When you wish to save a resource, you can do so by clicking the heart on the top right corner of the page. You will then get an option to store the resource in a folder',
+        text: 'When you wish to save a resource, you can do so by clicking the heart button. You will then get an option to store the resource in a folder',
       },
       folderInfo: {
         title: 'How to organise your favourite resources in folders',
@@ -1070,7 +1070,7 @@ const messages = {
       linkCopied: 'Copied to clipboard',
       addToMyNdla: 'Add to My NDLA',
       addedToMyNdla: 'Added to My NDLA',
-      addedToFolder: 'Resource added to "{{folderName}}"',
+      addedToFolder: 'Resource added to ',
       removedFromFolder: 'Removed from "{{folderName}}"',
       titleUpdated: 'Title updated',
       tagsUpdated: 'Tags updated',

package/src/locale/messages-nb.ts

@@ -1021,7 +1021,7 @@ const messages = {
     more: 'Flere valg',
     listView: 'Listevisning',
     detailView: 'Detaljrik listevisning',
-    shortView: 'Kort visning',
+    shortView: 'Kortvisning',
     myPage: {
       confirmDeleteAccount: 'Er du sikker på at du vil slette kontoen?',
       confirmDeleteAccountButton: 'Slett konto',
@@ -1048,7 +1048,7 @@ const messages = {
       feide: 'Dette henter vi om deg fra Feide',
       storageInfo: {
         title: 'Slik lagrer du dine favorittressurser fra NDLA',
-        text: 'Når du ønsker å lagre en ressurs, kan du gjøre dette ved å klikke på hjertet øverst til høyre på siden. Du vil da få mulighet til å lagre ressursen i en mappe.',
+        text: 'Når du ønsker å lagre en ressurs, kan du gjøre dette ved å klikke på hjerteknappen der den er tilgjengelig. Du vil da få mulighet til å lagre ressursen i en mappe.',
       },
       folderInfo: {
         title: 'Slik organiserer du dine favorittressurser i mapper',
@@ -1068,7 +1068,7 @@ const messages = {
       linkCopied: 'Kopiert til utklippstavle',
       addToMyNdla: 'Legg i Min NDLA',
       addedToMyNdla: 'Lagt i Min NDLA',
-      addedToFolder: 'Ressurs er lagt i "{{folderName}}"',
+      addedToFolder: 'Ressurs er lagt i ',
       removedFromFolder: 'Fjernet fra "{{folderName}}"',
       titleUpdated: 'Tittel oppdatert',
       tagsUpdated: 'Tags oppdatert',

package/src/locale/messages-nn.ts

@@ -1022,7 +1022,7 @@ const messages = {
     more: 'Fleire val',
     listView: 'Listevisning',
     detailView: 'Detaljrik listevisning',
-    shortView: 'Kort visning',
+    shortView: 'Kortvisning',
     myPage: {
       confirmDeleteAccount: 'Er du sikker på at du vil slette kontoen?',
       confirmDeleteAccountButton: 'Slett konto',
@@ -1048,7 +1048,7 @@ const messages = {
       feide: 'Dette henter vi om deg fra Feide',
       storageInfo: {
         title: 'Slik lagrer du dine favorittressurser fra NDLA',
-        text: 'Når du ønsker å lagre en ressurs, kan du gjøre dette ved å klikke på hjertet øverst til høyre på siden. Du vil da få mulighet til å lagre ressursen i en mappe.',
+        text: 'Når du ønsker å lagre en ressurs, kan du gjøre dette ved å klikke på hjerteknappen der den er tilgjengeleg. Du vil da få mulighet til å lagre ressursen i en mappe.',
       },
       folderInfo: {
         title: 'Slik organiserer du dine favorittressurser i mapper',
@@ -1068,7 +1068,7 @@ const messages = {
       linkCopied: 'Kopiert til utklippstavla',
       addToMyNdla: 'Legg i Min NDLA',
       addedToMyNdla: 'Lagt i Min NDLA',
-      addedToFolder: 'Ressurs er lagt i "{{folderName}}"',
+      addedToFolder: 'Ressurs er lagt i ',
       removedFromFolder: 'Fjernet fra "{{folderName}}"',
       titleUpdated: 'Tittel oppdatert',
       tagsUpdated: 'Tags oppdatert',

package/src/locale/messages-se.ts

@@ -1021,7 +1021,7 @@ const messages = {
     more: 'Flere valg',
     listView: 'Listevisning',
     detailView: 'Detaljrik listevisning',
-    shortView: 'Kort visning',
+    shortView: 'Kortvisning',
     myPage: {
       confirmDeleteAccount: 'Er du sikker på at du vil slette kontoen?',
       confirmDeleteAccountButton: 'Slett konto',
@@ -1048,7 +1048,7 @@ const messages = {
       feide: 'Dette henter vi om deg fra Feide',
       storageInfo: {
         title: 'Slik lagrer du dine favorittressurser fra NDLA',
-        text: 'Når du ønsker å lagre en ressurs, kan du gjøre dette ved å klikke på hjertet øverst til høyre på siden. Du vil da få mulighet til å lagre ressursen i en mappe.',
+        text: 'Når du ønsker å lagre en ressurs, kan du gjøre dette ved å klikke på hjerteknappen der den er tilgjengeleg. Du vil da få mulighet til å lagre ressursen i en mappe.',
       },
       folderInfo: {
         title: 'Slik organiserer du dine favorittressurser i mapper',
@@ -1068,7 +1068,7 @@ const messages = {
       linkCopied: 'Kopiert til utklippstavla',
       addToMyNdla: 'Legg i Min NDLA',
       addedToMyNdla: 'Lagt i Min NDLA',
-      addedToFolder: 'Ressurs er lagt i "{{folderName}}"',
+      addedToFolder: 'Ressurs er lagt i ',
       removedFromFolder: 'Fjernet fra "{{folderName}}"',
       titleUpdated: 'Tittel oppdatert',
       tagsUpdated: 'Tags oppdatert',

package/src/locale/messages-sma.ts

@@ -1021,7 +1021,7 @@ const messages = {
     more: 'Flere valg',
     listView: 'Listevisning',
     detailView: 'Detaljrik listevisning',
-    shortView: 'Kort visning',
+    shortView: 'Kortvisning',
     myPage: {
       confirmDeleteAccount: 'Er du sikker på at du vil slette kontoen?',
       confirmDeleteAccountButton: 'Slett konto',
@@ -1048,7 +1048,7 @@ const messages = {
       feide: 'Dette henter vi om deg fra Feide',
       storageInfo: {
         title: 'Slik lagrer du dine favorittressurser fra NDLA',
-        text: 'Når du ønsker å lagre en ressurs, kan du gjøre dette ved å klikke på hjertet øverst til høyre på siden. Du vil da få mulighet til å lagre ressursen i en mappe.',
+        text: 'Når du ønsker å lagre en ressurs, kan du gjøre dette ved å klikke på hjerteknappen der den er tilgjengeleg. Du vil da få mulighet til å lagre ressursen i en mappe.',
       },
       folderInfo: {
         title: 'Slik organiserer du dine favorittressurser i mapper',
@@ -1068,7 +1068,7 @@ const messages = {
       linkCopied: 'Kopiert til utklippstavla',
       addToMyNdla: 'Legg i Min NDLA',
       addedToMyNdla: 'Lagt i Min NDLA',
-      addedToFolder: 'Ressurs er lagt i "{{folderName}}"',
+      addedToFolder: 'Ressurs er lagt i ',
       removedFromFolder: 'Fjernet fra "{{folderName}}"',
       titleUpdated: 'Tittel oppdatert',
       tagsUpdated: 'Tags oppdatert',

package/src/main.scss

@@ -15,9 +15,6 @@
 @import 'FactBox/component.factbox';
 @import 'Aside/component.aside';
 @import 'Article/component.footnotes';
-@import 'NoContentBox/component.no-content-box.scss';
-@import 'BackgroundImage/component.background-image';
-@import 'Portrait/component.portrait.scss';
 @import 'global/components/component.logo';
 @import 'MediaList/component.medialist';
 @import 'RelatedArticleList/component.related-articles';
@@ -32,12 +29,7 @@
 @import 'Translation/component.translation-box';
 @import 'Search/component.search';
 @import 'Subject/component.subject';
-@import 'InfoBox/component.info-box';
 @import 'CompetenceGoals/component.competence-goals';
-@import 'ContentCard/component.content-card';
-@import 'InfoWidget/component.info-widget';
 @import 'Carousel/component.carousel';
-@import 'FileList/component.file-list';
 @import 'SectionHeading/component.section-heading';
-@import 'AuthorInfo/component.author-info';
 @import 'NDLAFilm/component.film-movielist';

package/es/BackgroundImage/BackgroundImage.js

@@ -1,27 +0,0 @@
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-import React from 'react';
-import BEMHelper from 'react-bem-helper';
-import { jsx as ___EmotionJSX } from "@emotion/core";
-var classes = BEMHelper('c-background-image');
-
-var BackgroundImage = function BackgroundImage(_ref) {
-  var images = _ref.images,
-      _ref$showOverlay = _ref.showOverlay,
-      showOverlay = _ref$showOverlay === void 0 ? false : _ref$showOverlay;
-  return ___EmotionJSX("div", classes('', {
-    showOverlay: showOverlay
-  }), images && images.map(function (image) {
-    return image.types.map(function (type) {
-      return ___EmotionJSX("div", _extends({
-        key: "".concat(image.url).concat(type)
-      }, classes('background', type), {
-        style: {
-          backgroundImage: "url(".concat(image.url, ")")
-        }
-      }));
-    });
-  }));
-};
-
-export default BackgroundImage;

package/es/BackgroundImage/index.js

@@ -1,2 +0,0 @@
-import BackgroundImage from './BackgroundImage';
-export default BackgroundImage;

package/es/Search/SearchFilter.js

@@ -1,72 +0,0 @@
-import React from 'react';
-import BEMHelper from 'react-bem-helper';
-import PropTypes from 'prop-types';
-import { FilterList } from '../Filter';
-import { jsx as ___EmotionJSX } from "@emotion/core";
-var searchFilterClasses = BEMHelper({
-  prefix: 'c-',
-  name: 'search-filter',
-  outputIsString: true
-});
-var valueShape = PropTypes.oneOfType([PropTypes.string, PropTypes.number]);
-
-var SearchFilter = function SearchFilter(_ref) {
-  var label = _ref.label,
-      options = _ref.options,
-      values = _ref.values,
-      defaultVisibleCount = _ref.defaultVisibleCount,
-      showLabel = _ref.showLabel,
-      hideLabel = _ref.hideLabel,
-      narrowScreenOnly = _ref.narrowScreenOnly,
-      contextFilter = _ref.contextFilter,
-      onChange = _ref.onChange,
-      noFilterSelectedLabel = _ref.noFilterSelectedLabel,
-      children = _ref.children;
-  var modifiers = [];
-
-  if (narrowScreenOnly) {
-    modifiers.push('narrow-screen-only');
-  }
-
-  if (contextFilter) {
-    modifiers.push('context-filter');
-  }
-
-  return ___EmotionJSX("div", {
-    className: searchFilterClasses('', modifiers)
-  }, ___EmotionJSX(FilterList, {
-    options: options,
-    label: label,
-    labelNotVisible: contextFilter,
-    values: values,
-    defaultVisibleCount: defaultVisibleCount,
-    modifiers: !contextFilter ? 'search' : null,
-    showLabel: showLabel,
-    hideLabel: hideLabel,
-    onChange: onChange,
-    alignedGroup: true,
-    noFilterSelectedLabel: noFilterSelectedLabel
-  }), children);
-};
-
-SearchFilter.propTypes = {
-  label: PropTypes.string.isRequired,
-  options: PropTypes.arrayOf(PropTypes.shape({
-    value: valueShape.isRequired,
-    title: PropTypes.string.isRequired,
-    noResults: PropTypes.bool
-  })).isRequired,
-  values: PropTypes.arrayOf(valueShape),
-  defaultVisibleCount: PropTypes.number,
-  onChange: PropTypes.func,
-  showLabel: PropTypes.string,
-  hideLabel: PropTypes.string,
-  narrowScreenOnly: PropTypes.bool,
-  noFilterSelectedLabel: PropTypes.string,
-  contextFilter: PropTypes.bool,
-  children: PropTypes.node
-};
-SearchFilter.defaultProps = {
-  values: []
-};
-export default SearchFilter;

package/es/Search/SearchFilterList.js

@@ -1,115 +0,0 @@
-var _this = this;
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-import React, { Fragment } from 'react';
-import BEMHelper from 'react-bem-helper';
-import PropTypes from 'prop-types';
-import { FilterList, ToggleItem } from '../Filter';
-import { jsx as ___EmotionJSX } from "@emotion/core";
-var searchFilterClasses = BEMHelper({
-  prefix: 'c-',
-  name: 'search-filter',
-  outputIsString: true
-});
-var valueShape = PropTypes.oneOfType([PropTypes.string, PropTypes.number]);
-
-var SearchFilterList = function SearchFilterList(_ref) {
-  var label = _ref.label,
-      options = _ref.options,
-      values = _ref.values,
-      narrowScreenOnly = _ref.narrowScreenOnly,
-      _onChange = _ref.onChange,
-      onSubfilterChange = _ref.onSubfilterChange,
-      preid = _ref.preid,
-      noFilterSelectedLabel = _ref.noFilterSelectedLabel,
-      subjectValues = _ref.subjectValues,
-      children = _ref.children;
-  return ___EmotionJSX("div", {
-    className: searchFilterClasses('')
-  }, ___EmotionJSX("div", null, options.map(function (option, index) {
-    var itemModifiers = [];
-    var checked = values.some(function (value) {
-      return value === option.value;
-    });
-
-    if (!checked && index + 1 > _this.state.visibleCount) {
-      itemModifiers.push('hidden');
-    }
-
-    var disabled = option.noResults || option.hits === 0;
-
-    if (disabled) {
-      itemModifiers.push('no-results');
-    }
-
-    return ___EmotionJSX(Fragment, {
-      key: option.value
-    }, ___EmotionJSX(ToggleItem, {
-      modifiers: itemModifiers,
-      id: preid + option.value,
-      value: option.value,
-      disabled: disabled,
-      tabIndex: disabled ? -1 : 0,
-      checked: checked,
-      icon: option.icon,
-      label: option.title,
-      component: "div",
-      onChange: function onChange(event) {
-        var newValues = null;
-
-        if (event.currentTarget.checked) {
-          newValues = [].concat(_toConsumableArray(values), [option.value]);
-        } else {
-          newValues = values.filter(function (value) {
-            return value !== option.value;
-          });
-        }
-
-        if (_onChange) {
-          _onChange(newValues, option.value);
-        }
-      }
-    }), ___EmotionJSX("div", {
-      className: searchFilterClasses()
-    }, ___EmotionJSX(FilterList, {
-      options: option.subjectFilters,
-      label: label,
-      labelNotVisible: true,
-      values: subjectValues[option.value],
-      onChange: function onChange(subjectFilters, subjectFilter) {
-        return onSubfilterChange(option.value, subjectFilters, subjectFilter);
-      },
-      alignedGroup: true,
-      noFilterSelectedLabel: noFilterSelectedLabel
-    })));
-  })), children);
-};
-
-SearchFilterList.propTypes = {
-  label: PropTypes.string.isRequired,
-  options: PropTypes.arrayOf(PropTypes.shape({
-    value: valueShape.isRequired,
-    title: PropTypes.string.isRequired,
-    noResults: PropTypes.bool
-  })).isRequired,
-  values: PropTypes.arrayOf(valueShape),
-  onChange: PropTypes.func,
-  onSubfilterChange: PropTypes.func,
-  noFilterSelectedLabel: PropTypes.string,
-  children: PropTypes.node
-};
-SearchFilterList.defaultProps = {
-  values: []
-};
-export default SearchFilterList;

package/es/Search/SearchOverlay.js

@@ -1,39 +0,0 @@
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-import React, { Fragment } from 'react';
-import PropTypes from 'prop-types';
-import BEMHelper from 'react-bem-helper';
-import { Cross } from '@ndla/icons/action';
-import { CSSTransition } from 'react-transition-group';
-import Fade from '../Animation/Fade';
-import { jsx as ___EmotionJSX } from "@emotion/core";
-var classes = BEMHelper({
-  prefix: 'c-',
-  name: 'search-overlay'
-});
-
-var SearchOverlay = function SearchOverlay(_ref) {
-  var close = _ref.close,
-      isOpen = _ref.isOpen,
-      children = _ref.children;
-  return ___EmotionJSX(Fragment, null, ___EmotionJSX(Fade, {
-    "in": isOpen
-  }, ___EmotionJSX("div", {
-    className: "o-backdrop"
-  })), ___EmotionJSX(CSSTransition, {
-    timeout: 300,
-    classNames: classes().className,
-    unmountOnExit: true,
-    "in": isOpen
-  }, ___EmotionJSX("div", classes(), ___EmotionJSX("div", classes('container o-wrapper'), children, ___EmotionJSX("button", _extends({}, classes('close-button'), {
-    type: "button",
-    onClick: close
-  }), ___EmotionJSX(Cross, null))))));
-};
-
-SearchOverlay.propTypes = {
-  isOpen: PropTypes.bool.isRequired,
-  close: PropTypes.func,
-  children: PropTypes.node.isRequired
-};
-export default SearchOverlay;