Added role to icon. Added optional chaining to ndla-ui

NDLANO · Mar 11, 2021 · 30293be · 30293be
1 parent def0bfd
commit 30293be
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 15 deletions.
diff --git a/packages/carousel/src/Carousel.tsx b/packages/carousel/src/Carousel.tsx
@@ -7,7 +7,6 @@
  */
 
 import React, { Component } from 'react';
-// @ts-ignore
 import { ChevronRight, ChevronLeft } from '@ndla/icons/common';
 import { Swipeable, EventData } from 'react-swipeable';
 import { slideWrapperCSS, StyledButton, StyledSlideContent } from './Styles';

diff --git a/packages/ndla-icons/src/Icon.tsx b/packages/ndla-icons/src/Icon.tsx
@@ -10,13 +10,15 @@ export interface Props {
   width?: string;
   height?: string;
   viewBox?: string;
+  role?: string;
   style?: {}; // eslint-disable-line
 }
 const IconBase = ({
   children,
   color,
   size,
   style,
+  role,
   title,
   description,
   width,
@@ -34,6 +36,7 @@ const IconBase = ({
       height={height || computedSize}
       width={width || computedSize}
       className={classes}
+      role={role}
       {...props}
       style={{
         verticalAlign: 'middle',

diff --git a/packages/ndla-licenses/src/LicenseByline/LicenseDescription.tsx b/packages/ndla-licenses/src/LicenseByline/LicenseDescription.tsx
@@ -7,7 +7,6 @@
  */
 
 import React, { FC } from 'react';
-import PropTypes from 'prop-types';
 import { colors, spacing } from '@ndla/core';
 import styled from '@emotion/styled';
 import LicenseIconDescriptionList from './LicenseIconDescriptionList';
@@ -61,15 +60,4 @@ const LicenseDescription: FC<Props> = ({
   </StyledLicenseByline>
 );
 
-LicenseDescription.propTypes = {
-  children: PropTypes.node,
-  licenseRights: PropTypes.arrayOf(PropTypes.string.isRequired).isRequired,
-  messages: PropTypes.shape({
-    modelPremission: PropTypes.string,
-  }),
-  highlightCC: PropTypes.bool,
-  color: PropTypes.string,
-  locale: PropTypes.string,
-};
-
 export default LicenseDescription;
diff --git a/packages/ndla-ui/package.json b/packages/ndla-ui/package.json
@@ -67,6 +67,7 @@
     "react": "^16.8.4"
   },
   "devDependencies": {
+    "@babel/plugin-proposal-optional-chaining": "^7.11.0",
     "@types/reach__dialog": "^0.1.0",
     "css-loader": "^2.1.0",
     "enzyme": "^3.8.0",

diff --git a/packages/ndla-ui/src/AudioPlayer/Controls.tsx b/packages/ndla-ui/src/AudioPlayer/Controls.tsx
@@ -22,7 +22,6 @@ import {
   SliderHandle,
   SliderOrientation,
 } from '@reach/slider';
-// @ts-ignore
 import { Play, Pause } from '@ndla/icons/common';
 import { breakpoints, colors, fonts, misc, mq, spacing } from '@ndla/core';
 import { injectT, tType } from '@ndla/i18n';

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "baseUrl": ".",
-    "target": "esnext",
+    "target": "es5",
     "esModuleInterop": true,
     "jsx": "react",
     // isolatedModules and declaration are not allowed together at