@newskit-render/core 2.42.0 → 2.43.0-alpha.1

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.42.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@2.42.0-alpha.2...@newskit-render/core@2.42.0) (2023-02-03)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 # [2.41.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@2.41.0-alpha.1...@newskit-render/core@2.41.0) (2023-01-31)
 
 **Note:** Version bump only for package @newskit-render/core

package/assets/fontFamily.ts

@@ -0,0 +1,200 @@
+import localFont from '@next/font/local'
+
+const bitter = localFont({
+  src: [
+    {
+      path: './fonts/bitter-regular.woff2',
+      weight: '400',
+      style: 'normal',
+    },
+    {
+      path: './fonts/bitter-medium.woff2',
+      weight: '500',
+      style: 'normal',
+    },
+    {
+      path: './fonts/bitter-mediumitalic.woff2',
+      weight: '500',
+      style: 'italic',
+    },
+    {
+      path: './fonts/bitter-semibold.woff2',
+      weight: '600',
+      style: 'normal',
+    },
+  ],
+  fallback: ['serif'],
+  display: 'swap',
+})
+
+const poppins = localFont({
+  src: [
+    {
+      path: './fonts/poppins-bold-webfont.woff2',
+      weight: '700',
+      style: 'normal',
+    },
+    {
+      path: './fonts/poppins-bolditalic-webfont.woff2',
+      weight: 'normal',
+      style: 'italic',
+    },
+    {
+      path: './fonts/poppins-extrabold-webfont.woff2',
+      weight: '800',
+      style: 'normal',
+    },
+    {
+      path: './fonts/poppins-extrabolditalic-webfont.woff2',
+      weight: '800',
+      style: 'italic',
+    },
+    {
+      path: './fonts/poppins-italic-webfont.woff2',
+      weight: '400',
+      style: 'italic',
+    },
+    {
+      path: './fonts/poppins-light-webfont.woff2',
+      weight: '300',
+      style: 'normal',
+    },
+    {
+      path: './fonts/poppins-lightitalic-webfont.woff2',
+      weight: '300',
+      style: 'italic',
+    },
+    {
+      path: './fonts/poppins-medium-webfont.woff2',
+      weight: '500',
+      style: 'normal',
+    },
+    {
+      path: './fonts/poppins-mediumitalic-webfont.woff2',
+      weight: '500',
+      style: 'italic',
+    },
+    {
+      path: './fonts/poppins-regular-webfont.woff2',
+      weight: '400',
+      style: 'normal',
+    },
+    {
+      path: './fonts/poppins-semibold-webfont.woff2',
+      weight: '600',
+      style: 'normal',
+    },
+    {
+      path: './fonts/poppins-semibolditalic-webfont.woff2',
+      weight: '600',
+      style: 'italic',
+    },
+  ],
+  fallback: ['sans-serif'],
+  display: 'swap',
+})
+
+const dmSans = localFont({
+  src: [
+    {
+      path: './fonts/dmsans-regular-webfont.woff2',
+      weight: '400',
+      style: 'normal',
+    },
+    {
+      path: './fonts/dmsans-italic-webfont.woff2',
+      weight: '400',
+      style: 'italic',
+    },
+    {
+      path: './fonts/dmsans-medium-webfont.woff2',
+      weight: '500',
+      style: 'normal',
+    },
+    {
+      path: './fonts/dmsans-mediumitalic-webfont.woff2',
+      weight: '500',
+      style: 'italic',
+    },
+    {
+      path: './fonts/dmsans-bold-webfont.woff2',
+      weight: '700',
+      style: 'normal',
+    },
+    {
+      path: './fonts/dmsans-bolditalic-webfont.woff2',
+      weight: '700',
+      style: 'italic',
+    },
+  ],
+  fallback: ['sans-serif'],
+  display: 'swap',
+})
+
+const theSun = localFont({
+  src: [
+    {
+      path: './fonts/TheSun-Bold.ttf',
+      weight: '700',
+      style: 'normal',
+    },
+    {
+      path: './fonts/TheSun-Regular.ttf',
+      weight: '400',
+      style: 'normal',
+    },
+    {
+      path: './fonts/TheSun-Medium.ttf',
+      weight: '500',
+      style: 'normal',
+    },
+  ],
+  display: 'swap',
+})
+
+const gillSansMtStd = localFont({
+  src: [
+    {
+      path: './fonts/GillSansMTStd-Medium.otf',
+    },
+  ],
+  display: 'swap',
+})
+
+const timesModern = localFont({
+  src: [
+    {
+      path: './fonts/TimesModern-Regular.otf',
+    },
+  ],
+  display: 'swap',
+})
+
+const timesDigital = localFont({
+  src: [
+    {
+      path: './fonts/TimesDigitalW04-Regular.ttf',
+    },
+  ],
+  display: 'swap',
+})
+
+const montserrat = localFont({
+  src: [
+    {
+      path: './fonts/Montserrat-Regular.ttf',
+    },
+  ],
+  display: 'swap',
+})
+
+export {
+  bitter,
+  poppins,
+  dmSans,
+  theSun,
+  gillSansMtStd,
+  timesModern,
+  timesDigital,
+  montserrat,
+}

package/components/header/index.tsx

@@ -5,10 +5,7 @@ import {
   PastDueBannerExternal,
   NavigationPrimary,
 } from '@newskit-render/shared-components'
-import {
-  renderCustomLightTheme as LightTheme,
-  renderCustomDarkTheme as DarkTheme,
-} from '../../theme'
+
 import { AppContext } from '../../context'
 import { useThemeDropdownObject } from '../../helpers/useThemeDropdownObject'
 import { sectionLinks } from './navigation-links'
@@ -36,23 +33,13 @@ const Header: React.FC<{ user: UserData }> = ({ user }) => {
 
   const { theme, setTheme } = useContext(AppContext)
   const themeDropdownObject = useThemeDropdownObject(setTheme)
-  const { ...restThemes } = themeDropdownObject.options
-
-  const themeDropdownObjectUpdated = {
-    ...themeDropdownObject,
-    options: {
-      LightTheme,
-      DarkTheme,
-      ...restThemes,
-    },
-  }
 
   return (
     <>
       <NavigationPrimary
         {...navigationPrimary}
         customTheme={theme}
-        themeDropdownObject={themeDropdownObjectUpdated}
+        themeDropdownObject={themeDropdownObject}
       />
       <PastDueBannerExternal
         pastDueBanner={pastDueBanner}

package/config/multiTenancy.ts

@@ -1,9 +1,8 @@
 import { sharedTheme, timesTheme } from '@newskit-render/shared-components'
 import { Publisher } from '@newskit-render/api'
-import { demo } from '../theme/strings'
 
 export const translationsMap = {
-  [Publisher.DEMO]: demo,
+  [Publisher.DEMO]: {},
 }
 
 export const themesMap = {

package/context/app-context/AppContext.test.tsx

@@ -1,8 +1,7 @@
 import React from 'react'
 import { render } from 'react-dom'
 import { act } from 'react-dom/test-utils'
-import { sharedTheme } from '@newskit-render/shared-components'
-import { renderCustomDarkTheme } from '../../theme'
+import { sharedTheme, sharedThemeDark } from '@newskit-render/shared-components'
 import { AppContextProvider, AppContext } from '.'
 
 const container = document.createElement('div')
@@ -36,7 +35,7 @@ describe('AppContext tests', () => {
                 type="button"
                 aria-label="btn"
                 data-testid="button"
-                onClick={(_) => setTheme(renderCustomDarkTheme)}
+                onClick={(_) => setTheme(sharedThemeDark)}
               />
               {JSON.stringify(theme)}
             </div>
@@ -51,6 +50,6 @@ describe('AppContext tests', () => {
       button?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
     })
 
-    expect(container.textContent).toBe(JSON.stringify(renderCustomDarkTheme))
+    expect(container.textContent).toBe(JSON.stringify(sharedThemeDark))
   })
 })