@ndla/ui 3.3.11 → 3.3.12

package/src/Frontpage/FrontpageAllSubjects.tsx

@@ -73,7 +73,7 @@ const StyledLetterSpacing = styled.span`
 type subjectProps = {
   name: string;
   url?: string;
-  path: string;
+  path?: string;
   id?: string;
 };
 type categoryProps = {
@@ -160,7 +160,7 @@ const renderList = (
                           onNavigate();
                         }
                       }}
-                      to={subject.url || subject.path}>
+                      to={subject.url || subject.path || ''}>
                       {subject.name}
                     </SafeLink>
                     <StyledSpacingElement />

package/src/SearchTypeResult/SearchFieldHeader.tsx

@@ -6,7 +6,7 @@
  *
  */
 
-import React, { useEffect, useRef, useState } from 'react';
+import React, { FormEvent, useEffect, useRef, useState } from 'react';
 import styled from '@emotion/styled';
 import { colors, breakpoints, mq } from '@ndla/core';
 // @ts-ignore
@@ -76,8 +76,8 @@ const SearchInput = styled.input`
 `;
 
 type Props = {
-  onSubmit: (event: {}) => void;
-  value: string;
+  onSubmit: (event: FormEvent<HTMLFormElement>) => void;
+  value?: string;
   onChange: (value: string) => void;
   filters?: PopupFilterProps;
   activeFilters?: {

package/src/SearchTypeResult/SearchHeader.tsx

@@ -6,7 +6,7 @@
  *
  */
 
-import React from 'react';
+import React, { FormEvent } from 'react';
 import styled from '@emotion/styled';
 import { breakpoints, fonts, mq, spacing } from '@ndla/core';
 
@@ -75,7 +75,7 @@ type Props = {
   searchPhrase?: string;
   searchPhraseSuggestion?: string;
   searchPhraseSuggestionOnClick?: () => void;
-  searchValue: string;
+  searchValue?: string;
   filters?: PopupFilterProps;
   activeFilters?: {
     filters: FilterProps[];
@@ -83,7 +83,7 @@ type Props = {
   };
   competenceGoals?: CompetenceGoalsItemType[];
   onSearchValueChange: (value: string) => void;
-  onSubmit: () => void;
+  onSubmit: (event: FormEvent<HTMLFormElement>) => void;
   noResults?: boolean;
 };
 

package/src/SearchTypeResult/SearchItem.tsx

@@ -203,12 +203,11 @@ type context = {
 };
 
 export type SearchItemType = {
-  id: string;
+  id: string | number;
   title: string;
   url: string;
   ingress: string;
-  contexts: context[];
-  image: React.ReactNode | null;
+  contexts?: context[];
   img?: { url: string; alt: string };
   labels?: string[];
   children?: React.ReactNode;
@@ -220,7 +219,7 @@ type Props = {
 const SearchItem = ({ item, type }: Props) => {
   const { t } = useTranslation();
   const { title, url, ingress, contexts, img = null, labels = [] } = item;
-  const mainContext = contexts[0];
+  const mainContext = contexts?.[0];
 
   const Breadcrumb = ({ breadcrumb, children }: { breadcrumb: string[]; children?: React.ReactNode }) => (
     <BreadcrumbPath>
@@ -268,7 +267,7 @@ const SearchItem = ({ item, type }: Props) => {
           {item.children}
           <ItemText>{parse(ingress)}</ItemText>
           {mainContext && <Breadcrumb breadcrumb={mainContext.breadcrumb} />}
-          {contexts.length > 1 && (
+          {contexts && contexts.length > 1 && (
             <ContextsWrapper>
               <Modal
                 activateButton={

package/src/SearchTypeResult/SearchNotionItem.tsx

@@ -120,7 +120,7 @@ const AuthorsWrapper = styled.div`
 `;
 
 export type SearchNotionItemProps = {
-  id: string;
+  id: string | number;
   title: string;
   text: React.ReactNode;
   image?: { url: string; alt: string };

package/src/SearchTypeResult/index.ts

@@ -12,4 +12,6 @@ import SearchFieldHeader from './SearchFieldHeader';
 import SearchNotionsResult from './SearchNotionsResult';
 import SearchSubjectResult from './SearchSubjectResult';
 
+export type { ContentType } from './SearchTypeResult';
+
 export { SearchTypeResult, SearchHeader, SearchFieldHeader, SearchNotionsResult, SearchSubjectResult };