@prezly/theme-kit-nextjs 1.1.5-0 → 1.1.5-1

package/README.md

@@ -98,13 +98,13 @@ type AnyPageProps = Record<string, any>;
 function App({ Component, pageProps }: AppProps<AnyPageProps>) {
     const { newsroomContextProps, ...customPageProps } = pageProps as PageProps & AnyPageProps;
 
-    // eslint-disable react/jsx-props-no-spreading
+    /* eslint-disable react/jsx-props-no-spreading */
     return (
         <NewsroomContextProvider {...newsroomContextProps}>
             <Component {...customPageProps} />
         </NewsroomContextProvider>
     );
-    // eslint-enable react/jsx-props-no-spreading
+    /* eslint-enable react/jsx-props-no-spreading */
 }
 
 export default App;

package/build/adapter-nextjs/processRequest.js

@@ -14,22 +14,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processRequest = void 0;
 var data_fetching_1 = require("../data-fetching");
 var intl_1 = require("../intl");
-// TODO: Try to make the typings even more robust
-function extractServerSideProps(props) {
-    var localeResolved = props.localeResolved, pageProps = __rest(props, ["localeResolved"]);
-    return {
-        pageProps: pageProps,
-        serverSideProps: { localeResolved: localeResolved },
-    };
-}
 function processRequest(context, props, canonicalUrl) {
     var nextLocale = context.locale, query = context.query;
-    var _a = extractServerSideProps(props), pageProps = _a.pageProps, serverSideProps = _a.serverSideProps;
-    if (!serverSideProps.localeResolved) {
+    var localeResolved = props.localeResolved, pageProps = __rest(props, ["localeResolved"]);
+    if (!localeResolved) {
         return { notFound: true };
     }
     if (canonicalUrl) {
-        var _b = pageProps.newsroomContextProps, languages = _b.languages, localeCode = _b.localeCode;
+        var _a = pageProps.newsroomContextProps, languages = _a.languages, localeCode = _a.localeCode;
         var currentLocale = intl_1.LocaleObject.fromAnyCode(localeCode);
         var shortestLocaleCode = (0, data_fetching_1.getShortestLocaleCode)(languages, currentLocale);
         var redirect = (0, intl_1.getRedirectToCanonicalLocale)(shortestLocaleCode, nextLocale, canonicalUrl, query);

package/build/adapter-nextjs/processRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"processRequest.js","sourceRoot":"","sources":["../../src/adapter-nextjs/processRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,kDAAyD;AACzD,gCAAqE;AAGrE,iDAAiD;AACjD,SAAS,sBAAsB,CAAQ,KAAkC;IAI7D,IAAA,cAAc,GAAmB,KAAK,eAAxB,EAAK,SAAS,UAAK,KAAK,EAAxC,kBAAgC,CAAF,CAAW;IAE/C,OAAO;QACH,SAAS,EAAE,SAA6B;QACxC,eAAe,EAAE,EAAE,cAAc,gBAAA,EAAE;KACtC,CAAC;AACN,CAAC;AAED,SAAgB,cAAc,CAC1B,OAAkC,EAClC,KAA8C,EAC9C,YAAqB;IAEb,IAAQ,UAAU,GAAY,OAAO,OAAnB,EAAE,KAAK,GAAK,OAAO,MAAZ,CAAa;IAExC,IAAA,KAAiC,sBAAsB,CAAC,KAAK,CAAC,EAA5D,SAAS,eAAA,EAAE,eAAe,qBAAkC,CAAC;IAErE,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE;QACjC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;KAC7B;IAED,IAAI,YAAY,EAAE;QACR,IAAA,KAA4B,SAAS,CAAC,oBAAoB,EAAxD,SAAS,eAAA,EAAE,UAAU,gBAAmC,CAAC;QACjE,IAAM,aAAa,GAAG,mBAAY,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC3D,IAAM,kBAAkB,GAAG,IAAA,qCAAqB,EAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QAE3E,IAAM,QAAQ,GAAG,IAAA,mCAA4B,EACzC,kBAAkB,EAClB,UAAU,EACV,YAAY,EACZ,KAAK,CACR,CAAC;QACF,IAAI,QAAQ,EAAE;YACV,OAAO,EAAE,QAAQ,UAAA,EAAE,CAAC;SACvB;KACJ;IAED,OAAO;QACH,KAAK,EAAE,SAAS;KACnB,CAAC;AACN,CAAC;AAhCD,wCAgCC"}
+{"version":3,"file":"processRequest.js","sourceRoot":"","sources":["../../src/adapter-nextjs/processRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,kDAAyD;AACzD,gCAAqE;AAGrE,SAAgB,cAAc,CAC1B,OAAkC,EAClC,KAA8C,EAC9C,YAAqB;IAEb,IAAQ,UAAU,GAAY,OAAO,OAAnB,EAAE,KAAK,GAAK,OAAO,MAAZ,CAAa;IAEtC,IAAA,cAAc,GAAmB,KAAK,eAAxB,EAAK,SAAS,UAAK,KAAK,EAAxC,kBAAgC,CAAF,CAAW;IAE/C,IAAI,CAAC,cAAc,EAAE;QACjB,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;KAC7B;IAED,IAAI,YAAY,EAAE;QACR,IAAA,KAA4B,SAAS,CAAC,oBAAoB,EAAxD,SAAS,eAAA,EAAE,UAAU,gBAAmC,CAAC;QACjE,IAAM,aAAa,GAAG,mBAAY,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC3D,IAAM,kBAAkB,GAAG,IAAA,qCAAqB,EAAC,SAAS,EAAE,aAAa,CAAC,CAAC;QAE3E,IAAM,QAAQ,GAAG,IAAA,mCAA4B,EACzC,kBAAkB,EAClB,UAAU,EACV,YAAY,EACZ,KAAK,CACR,CAAC;QACF,IAAI,QAAQ,EAAE;YACV,OAAO,EAAE,QAAQ,UAAA,EAAE,CAAC;SACvB;KACJ;IAED,OAAO;QACH,KAAK,EAAE,SAA8B;KACxC,CAAC;AACN,CAAC;AAhCD,wCAgCC"}

package/build/newsroom-context/context.d.ts

@@ -7,8 +7,8 @@ export interface NewsroomContextType {
     companyInformation: NewsroomCompanyInformation;
     categories: Category[];
     contacts?: NewsroomContact[];
-    selectedCategory?: Category;
-    selectedStory?: ExtendedStory;
+    currentCategory?: Category;
+    currentStory?: ExtendedStory;
     languages: NewsroomLanguageSettings[];
     locale: LocaleObject;
     themePreset: NewsroomThemePreset;

package/build/newsroom-context/context.js

@@ -17,14 +17,14 @@ var react_1 = require("react");
 var intl_1 = require("../intl");
 exports.NewsroomContext = (0, react_1.createContext)(undefined);
 var NewsroomContextProvider = function (_a) {
-    var categories = _a.categories, contacts = _a.contacts, newsroom = _a.newsroom, selectedCategory = _a.selectedCategory, selectedStory = _a.selectedStory, companyInformation = _a.companyInformation, languages = _a.languages, localeCode = _a.localeCode, themePreset = _a.themePreset, algoliaSettings = _a.algoliaSettings, children = _a.children;
+    var categories = _a.categories, contacts = _a.contacts, newsroom = _a.newsroom, currentCategory = _a.currentCategory, currentStory = _a.currentStory, companyInformation = _a.companyInformation, languages = _a.languages, localeCode = _a.localeCode, themePreset = _a.themePreset, algoliaSettings = _a.algoliaSettings, children = _a.children;
     var locale = (0, react_1.useMemo)(function () { return intl_1.LocaleObject.fromAnyCode(localeCode || intl_1.DEFAULT_LOCALE); }, [localeCode]);
     return ((0, jsx_runtime_1.jsx)(exports.NewsroomContext.Provider, __assign({ value: {
             categories: categories,
             contacts: contacts,
             newsroom: newsroom,
-            selectedCategory: selectedCategory,
-            selectedStory: selectedStory,
+            currentCategory: currentCategory,
+            currentStory: currentStory,
             companyInformation: companyInformation,
             languages: languages,
             locale: locale,

package/build/newsroom-context/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/newsroom-context/context.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;AASA,+BAAkE;AAGlE,gCAAuD;AAmB1C,QAAA,eAAe,GAAG,IAAA,qBAAa,EAAkC,SAAS,CAAC,CAAC;AAElF,IAAM,uBAAuB,GAA4C,UAAC,EAYhF;QAXG,UAAU,gBAAA,EACV,QAAQ,cAAA,EACR,QAAQ,cAAA,EACR,gBAAgB,sBAAA,EAChB,aAAa,mBAAA,EACb,kBAAkB,wBAAA,EAClB,SAAS,eAAA,EACT,UAAU,gBAAA,EACV,WAAW,iBAAA,EACX,eAAe,qBAAA,EACf,QAAQ,cAAA;IAER,IAAM,MAAM,GAAG,IAAA,eAAO,EAClB,cAAM,OAAA,mBAAY,CAAC,WAAW,CAAC,UAAU,IAAI,qBAAc,CAAC,EAAtD,CAAsD,EAC5D,CAAC,UAAU,CAAC,CACf,CAAC;IAEF,OAAO,CACH,uBAAC,uBAAe,CAAC,QAAQ,aACrB,KAAK,EAAE;YACH,UAAU,YAAA;YACV,QAAQ,UAAA;YACR,QAAQ,UAAA;YACR,gBAAgB,kBAAA;YAChB,aAAa,eAAA;YACb,kBAAkB,oBAAA;YAClB,SAAS,WAAA;YACT,MAAM,QAAA;YACN,WAAW,aAAA;YACX,eAAe,iBAAA;SAClB,gBAEA,QAAQ,YACc,CAC9B,CAAC;AACN,CAAC,CAAC;AApCW,QAAA,uBAAuB,2BAoClC"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/newsroom-context/context.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;AASA,+BAAkE;AAGlE,gCAAuD;AAmB1C,QAAA,eAAe,GAAG,IAAA,qBAAa,EAAkC,SAAS,CAAC,CAAC;AAElF,IAAM,uBAAuB,GAA4C,UAAC,EAYhF;QAXG,UAAU,gBAAA,EACV,QAAQ,cAAA,EACR,QAAQ,cAAA,EACR,eAAe,qBAAA,EACf,YAAY,kBAAA,EACZ,kBAAkB,wBAAA,EAClB,SAAS,eAAA,EACT,UAAU,gBAAA,EACV,WAAW,iBAAA,EACX,eAAe,qBAAA,EACf,QAAQ,cAAA;IAER,IAAM,MAAM,GAAG,IAAA,eAAO,EAClB,cAAM,OAAA,mBAAY,CAAC,WAAW,CAAC,UAAU,IAAI,qBAAc,CAAC,EAAtD,CAAsD,EAC5D,CAAC,UAAU,CAAC,CACf,CAAC;IAEF,OAAO,CACH,uBAAC,uBAAe,CAAC,QAAQ,aACrB,KAAK,EAAE;YACH,UAAU,YAAA;YACV,QAAQ,UAAA;YACR,QAAQ,UAAA;YACR,eAAe,iBAAA;YACf,YAAY,cAAA;YACZ,kBAAkB,oBAAA;YAClB,SAAS,WAAA;YACT,MAAM,QAAA;YACN,WAAW,aAAA;YACX,eAAe,iBAAA;SAClB,gBAEA,QAAQ,YACc,CAC9B,CAAC;AACN,CAAC,CAAC;AApCW,QAAA,uBAAuB,2BAoClC"}

package/build/newsroom-context/hooks/index.d.ts

@@ -1,11 +1,11 @@
 export * from './useAlgoliaSettings';
 export * from './useCategories';
 export * from './useCompanyInformation';
+export * from './useCurrentCategory';
 export * from './useCurrentLocale';
+export * from './useCurrentStory';
 export * from './useGetLinkLocaleSlug';
 export * from './useGetTranslationUrl';
 export * from './useLanguages';
 export * from './useNewsroom';
 export * from './useNewsroomContext';
-export * from './useSelectedCategory';
-export * from './useSelectedStory';

package/build/newsroom-context/hooks/index.js

@@ -13,12 +13,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./useAlgoliaSettings"), exports);
 __exportStar(require("./useCategories"), exports);
 __exportStar(require("./useCompanyInformation"), exports);
+__exportStar(require("./useCurrentCategory"), exports);
 __exportStar(require("./useCurrentLocale"), exports);
+__exportStar(require("./useCurrentStory"), exports);
 __exportStar(require("./useGetLinkLocaleSlug"), exports);
 __exportStar(require("./useGetTranslationUrl"), exports);
 __exportStar(require("./useLanguages"), exports);
 __exportStar(require("./useNewsroom"), exports);
 __exportStar(require("./useNewsroomContext"), exports);
-__exportStar(require("./useSelectedCategory"), exports);
-__exportStar(require("./useSelectedStory"), exports);
 //# sourceMappingURL=index.js.map

package/build/newsroom-context/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAqC;AACrC,kDAAgC;AAChC,0DAAwC;AACxC,qDAAmC;AACnC,yDAAuC;AACvC,yDAAuC;AACvC,iDAA+B;AAC/B,gDAA8B;AAC9B,uDAAqC;AACrC,wDAAsC;AACtC,qDAAmC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uDAAqC;AACrC,kDAAgC;AAChC,0DAAwC;AACxC,uDAAqC;AACrC,qDAAmC;AACnC,oDAAkC;AAClC,yDAAuC;AACvC,yDAAuC;AACvC,iDAA+B;AAC/B,gDAA8B;AAC9B,uDAAqC"}

package/build/newsroom-context/hooks/useCurrentCategory.d.ts

@@ -0,0 +1 @@
+export declare const useCurrentCategory: () => import("@prezly/sdk").Category | undefined;

package/build/newsroom-context/hooks/useCurrentCategory.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useCurrentCategory = void 0;
+var useNewsroomContext_1 = require("./useNewsroomContext");
+var useCurrentCategory = function () {
+    var context = (0, useNewsroomContext_1.useNewsroomContext)();
+    return context.currentCategory;
+};
+exports.useCurrentCategory = useCurrentCategory;
+//# sourceMappingURL=useCurrentCategory.js.map

package/build/newsroom-context/hooks/useCurrentCategory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useCurrentCategory.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useCurrentCategory.ts"],"names":[],"mappings":";;;AAAA,2DAA0D;AAEnD,IAAM,kBAAkB,GAAG;IAC9B,IAAM,OAAO,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAErC,OAAO,OAAO,CAAC,eAAe,CAAC;AACnC,CAAC,CAAC;AAJW,QAAA,kBAAkB,sBAI7B"}

package/build/newsroom-context/hooks/useCurrentStory.d.ts

@@ -0,0 +1 @@
+export declare const useCurrentStory: () => import("@prezly/sdk").ExtendedStory | undefined;

package/build/newsroom-context/hooks/{useSelectedStory.js → useCurrentStory.js}

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSelectedStory = void 0;
+exports.useCurrentStory = void 0;
 var useNewsroomContext_1 = require("./useNewsroomContext");
-var useSelectedStory = function () {
+var useCurrentStory = function () {
     var context = (0, useNewsroomContext_1.useNewsroomContext)();
-    return context.selectedStory;
+    return context.currentStory;
 };
-exports.useSelectedStory = useSelectedStory;
-//# sourceMappingURL=useSelectedStory.js.map
+exports.useCurrentStory = useCurrentStory;
+//# sourceMappingURL=useCurrentStory.js.map

package/build/newsroom-context/hooks/useCurrentStory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useCurrentStory.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useCurrentStory.ts"],"names":[],"mappings":";;;AAAA,2DAA0D;AAEnD,IAAM,eAAe,GAAG;IAC3B,IAAM,OAAO,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAErC,OAAO,OAAO,CAAC,YAAY,CAAC;AAChC,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B"}

package/build/newsroom-context/hooks/useGetTranslationUrl.js

@@ -4,13 +4,13 @@ exports.useGetTranslationUrl = void 0;
 var router_1 = require("next/router");
 var react_1 = require("react");
 var data_fetching_1 = require("../../data-fetching");
-var useSelectedCategory_1 = require("./useSelectedCategory");
-var useSelectedStory_1 = require("./useSelectedStory");
+var useCurrentCategory_1 = require("./useCurrentCategory");
+var useCurrentStory_1 = require("./useCurrentStory");
 // Determine correct URL for translated stories/categories with a fallback to homepage
-function getTranslationUrl(locale, path, selectedCategory, selectedStory, noFallback) {
-    if (selectedCategory) {
-        if ((0, data_fetching_1.getCategoryHasTranslation)(selectedCategory, locale)) {
-            return (0, data_fetching_1.getCategoryUrl)(selectedCategory, locale);
+function getTranslationUrl(locale, path, currentCategory, currentStory, noFallback) {
+    if (currentCategory) {
+        if ((0, data_fetching_1.getCategoryHasTranslation)(currentCategory, locale)) {
+            return (0, data_fetching_1.getCategoryUrl)(currentCategory, locale);
         }
         if (noFallback) {
             return '';
@@ -18,8 +18,8 @@ function getTranslationUrl(locale, path, selectedCategory, selectedStory, noFall
         return '/';
     }
     var localeCode = locale.toUnderscoreCode();
-    if (selectedStory && selectedStory.culture.locale !== localeCode) {
-        var translatedStory = selectedStory.translations.find(function (_a) {
+    if (currentStory && currentStory.culture.locale !== localeCode) {
+        var translatedStory = currentStory.translations.find(function (_a) {
             var culture = _a.culture;
             return culture.locale === localeCode;
         });
@@ -35,11 +35,11 @@ function getTranslationUrl(locale, path, selectedCategory, selectedStory, noFall
 }
 function useGetTranslationUrl() {
     var asPath = (0, router_1.useRouter)().asPath;
-    var selectedCategory = (0, useSelectedCategory_1.useSelectedCategory)();
-    var selectedStory = (0, useSelectedStory_1.useSelectedStory)();
+    var currentCategory = (0, useCurrentCategory_1.useCurrentCategory)();
+    var currentStory = (0, useCurrentStory_1.useCurrentStory)();
     return (0, react_1.useCallback)(function (locale, noFallback) {
-        return getTranslationUrl(locale, asPath, selectedCategory, selectedStory, noFallback);
-    }, [asPath, selectedCategory, selectedStory]);
+        return getTranslationUrl(locale, asPath, currentCategory, currentStory, noFallback);
+    }, [asPath, currentCategory, currentStory]);
 }
 exports.useGetTranslationUrl = useGetTranslationUrl;
 //# sourceMappingURL=useGetTranslationUrl.js.map

package/build/newsroom-context/hooks/useGetTranslationUrl.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGetTranslationUrl.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useGetTranslationUrl.ts"],"names":[],"mappings":";;;AACA,sCAAwC;AACxC,+BAAoC;AAEpC,qDAAgF;AAGhF,6DAA4D;AAC5D,uDAAsD;AAEtD,sFAAsF;AACtF,SAAS,iBAAiB,CACtB,MAAoB,EACpB,IAAY,EACZ,gBAA2B,EAC3B,aAA6B,EAC7B,UAAoB;IAEpB,IAAI,gBAAgB,EAAE;QAClB,IAAI,IAAA,yCAAyB,EAAC,gBAAgB,EAAE,MAAM,CAAC,EAAE;YACrD,OAAO,IAAA,8BAAc,EAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;SACnD;QAED,IAAI,UAAU,EAAE;YACZ,OAAO,EAAE,CAAC;SACb;QAED,OAAO,GAAG,CAAC;KACd;IAED,IAAM,UAAU,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC;IAE7C,IAAI,aAAa,IAAI,aAAa,CAAC,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE;QAC9D,IAAM,eAAe,GAAG,aAAa,CAAC,YAAY,CAAC,IAAI,CACnD,UAAC,EAAW;gBAAT,OAAO,aAAA;YAAO,OAAA,OAAO,CAAC,MAAM,KAAK,UAAU;QAA7B,CAA6B,CACjD,CAAC;QACF,IAAI,eAAe,EAAE;YACjB,OAAO,WAAI,eAAe,CAAC,IAAI,CAAE,CAAC;SACrC;QAED,IAAI,UAAU,EAAE;YACZ,OAAO,EAAE,CAAC;SACb;QAED,OAAO,GAAG,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAgB,oBAAoB;IACxB,IAAA,MAAM,GAAK,IAAA,kBAAS,GAAE,OAAhB,CAAiB;IAC/B,IAAM,gBAAgB,GAAG,IAAA,yCAAmB,GAAE,CAAC;IAC/C,IAAM,aAAa,GAAG,IAAA,mCAAgB,GAAE,CAAC;IAEzC,OAAO,IAAA,mBAAW,EACd,UAAC,MAAoB,EAAE,UAAoB;QACvC,OAAA,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,aAAa,EAAE,UAAU,CAAC;IAA9E,CAA8E,EAClF,CAAC,MAAM,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAC5C,CAAC;AACN,CAAC;AAVD,oDAUC"}
+{"version":3,"file":"useGetTranslationUrl.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useGetTranslationUrl.ts"],"names":[],"mappings":";;;AACA,sCAAwC;AACxC,+BAAoC;AAEpC,qDAAgF;AAGhF,2DAA0D;AAC1D,qDAAoD;AAEpD,sFAAsF;AACtF,SAAS,iBAAiB,CACtB,MAAoB,EACpB,IAAY,EACZ,eAA0B,EAC1B,YAA4B,EAC5B,UAAoB;IAEpB,IAAI,eAAe,EAAE;QACjB,IAAI,IAAA,yCAAyB,EAAC,eAAe,EAAE,MAAM,CAAC,EAAE;YACpD,OAAO,IAAA,8BAAc,EAAC,eAAe,EAAE,MAAM,CAAC,CAAC;SAClD;QAED,IAAI,UAAU,EAAE;YACZ,OAAO,EAAE,CAAC;SACb;QAED,OAAO,GAAG,CAAC;KACd;IAED,IAAM,UAAU,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC;IAE7C,IAAI,YAAY,IAAI,YAAY,CAAC,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE;QAC5D,IAAM,eAAe,GAAG,YAAY,CAAC,YAAY,CAAC,IAAI,CAClD,UAAC,EAAW;gBAAT,OAAO,aAAA;YAAO,OAAA,OAAO,CAAC,MAAM,KAAK,UAAU;QAA7B,CAA6B,CACjD,CAAC;QACF,IAAI,eAAe,EAAE;YACjB,OAAO,WAAI,eAAe,CAAC,IAAI,CAAE,CAAC;SACrC;QAED,IAAI,UAAU,EAAE;YACZ,OAAO,EAAE,CAAC;SACb;QAED,OAAO,GAAG,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAgB,oBAAoB;IACxB,IAAA,MAAM,GAAK,IAAA,kBAAS,GAAE,OAAhB,CAAiB;IAC/B,IAAM,eAAe,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAC7C,IAAM,YAAY,GAAG,IAAA,iCAAe,GAAE,CAAC;IAEvC,OAAO,IAAA,mBAAW,EACd,UAAC,MAAoB,EAAE,UAAoB;QACvC,OAAA,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,UAAU,CAAC;IAA5E,CAA4E,EAChF,CAAC,MAAM,EAAE,eAAe,EAAE,YAAY,CAAC,CAC1C,CAAC;AACN,CAAC;AAVD,oDAUC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prezly/theme-kit-nextjs",
-  "version": "1.1.5-0",
+  "version": "1.1.5-1",
   "description": "Data layer and utility library for developing Prezly themes with NextJS",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/src/adapter-nextjs/processRequest.ts

@@ -4,19 +4,6 @@ import { getShortestLocaleCode } from '../data-fetching';
 import { getRedirectToCanonicalLocale, LocaleObject } from '../intl';
 import { PageProps, ServerSidePageProps } from '../types';
 
-// TODO: Try to make the typings even more robust
-function extractServerSideProps<Props>(props: Props & ServerSidePageProps): {
-    pageProps: Props;
-    serverSideProps: ServerSidePageProps;
-} {
-    const { localeResolved, ...pageProps } = props;
-
-    return {
-        pageProps: pageProps as unknown as Props,
-        serverSideProps: { localeResolved },
-    };
-}
-
 export function processRequest<Props>(
     context: GetServerSidePropsContext,
     props: Props & PageProps & ServerSidePageProps,
@@ -24,9 +11,9 @@ export function processRequest<Props>(
 ): GetServerSidePropsResult<Props> {
     const { locale: nextLocale, query } = context;
 
-    const { pageProps, serverSideProps } = extractServerSideProps(props);
+    const { localeResolved, ...pageProps } = props;
 
-    if (!serverSideProps.localeResolved) {
+    if (!localeResolved) {
         return { notFound: true };
     }
 
@@ -47,6 +34,6 @@ export function processRequest<Props>(
     }
 
     return {
-        props: pageProps,
+        props: pageProps as Props & PageProps,
     };
 }

package/src/newsroom-context/context.tsx

@@ -17,8 +17,8 @@ export interface NewsroomContextType {
     companyInformation: NewsroomCompanyInformation;
     categories: Category[];
     contacts?: NewsroomContact[];
-    selectedCategory?: Category;
-    selectedStory?: ExtendedStory;
+    currentCategory?: Category;
+    currentStory?: ExtendedStory;
     languages: NewsroomLanguageSettings[];
     locale: LocaleObject;
     themePreset: NewsroomThemePreset;
@@ -35,8 +35,8 @@ export const NewsroomContextProvider: FunctionComponent<NewsroomContextProps> =
     categories,
     contacts,
     newsroom,
-    selectedCategory,
-    selectedStory,
+    currentCategory,
+    currentStory,
     companyInformation,
     languages,
     localeCode,
@@ -55,8 +55,8 @@ export const NewsroomContextProvider: FunctionComponent<NewsroomContextProps> =
                 categories,
                 contacts,
                 newsroom,
-                selectedCategory,
-                selectedStory,
+                currentCategory,
+                currentStory,
                 companyInformation,
                 languages,
                 locale,

package/src/newsroom-context/hooks/index.ts

@@ -1,11 +1,11 @@
 export * from './useAlgoliaSettings';
 export * from './useCategories';
 export * from './useCompanyInformation';
+export * from './useCurrentCategory';
 export * from './useCurrentLocale';
+export * from './useCurrentStory';
 export * from './useGetLinkLocaleSlug';
 export * from './useGetTranslationUrl';
 export * from './useLanguages';
 export * from './useNewsroom';
 export * from './useNewsroomContext';
-export * from './useSelectedCategory';
-export * from './useSelectedStory';

package/src/newsroom-context/hooks/{useSelectedCategory.ts → useCurrentCategory.ts}

@@ -1,7 +1,7 @@
 import { useNewsroomContext } from './useNewsroomContext';
 
-export const useSelectedCategory = () => {
+export const useCurrentCategory = () => {
     const context = useNewsroomContext();
 
-    return context.selectedCategory;
+    return context.currentCategory;
 };

package/src/newsroom-context/hooks/{useSelectedStory.ts → useCurrentStory.ts}

@@ -1,7 +1,7 @@
 import { useNewsroomContext } from './useNewsroomContext';
 
-export const useSelectedStory = () => {
+export const useCurrentStory = () => {
     const context = useNewsroomContext();
 
-    return context.selectedStory;
+    return context.currentStory;
 };

package/src/newsroom-context/hooks/useGetTranslationUrl.ts

@@ -5,20 +5,20 @@ import { useCallback } from 'react';
 import { getCategoryHasTranslation, getCategoryUrl } from '../../data-fetching';
 import { LocaleObject } from '../../intl';
 
-import { useSelectedCategory } from './useSelectedCategory';
-import { useSelectedStory } from './useSelectedStory';
+import { useCurrentCategory } from './useCurrentCategory';
+import { useCurrentStory } from './useCurrentStory';
 
 // Determine correct URL for translated stories/categories with a fallback to homepage
 function getTranslationUrl(
     locale: LocaleObject,
     path: string,
-    selectedCategory?: Category,
-    selectedStory?: ExtendedStory,
+    currentCategory?: Category,
+    currentStory?: ExtendedStory,
     noFallback?: boolean,
 ) {
-    if (selectedCategory) {
-        if (getCategoryHasTranslation(selectedCategory, locale)) {
-            return getCategoryUrl(selectedCategory, locale);
+    if (currentCategory) {
+        if (getCategoryHasTranslation(currentCategory, locale)) {
+            return getCategoryUrl(currentCategory, locale);
         }
 
         if (noFallback) {
@@ -30,8 +30,8 @@ function getTranslationUrl(
 
     const localeCode = locale.toUnderscoreCode();
 
-    if (selectedStory && selectedStory.culture.locale !== localeCode) {
-        const translatedStory = selectedStory.translations.find(
+    if (currentStory && currentStory.culture.locale !== localeCode) {
+        const translatedStory = currentStory.translations.find(
             ({ culture }) => culture.locale === localeCode,
         );
         if (translatedStory) {
@@ -50,12 +50,12 @@ function getTranslationUrl(
 
 export function useGetTranslationUrl() {
     const { asPath } = useRouter();
-    const selectedCategory = useSelectedCategory();
-    const selectedStory = useSelectedStory();
+    const currentCategory = useCurrentCategory();
+    const currentStory = useCurrentStory();
 
     return useCallback(
         (locale: LocaleObject, noFallback?: boolean) =>
-            getTranslationUrl(locale, asPath, selectedCategory, selectedStory, noFallback),
-        [asPath, selectedCategory, selectedStory],
+            getTranslationUrl(locale, asPath, currentCategory, currentStory, noFallback),
+        [asPath, currentCategory, currentStory],
     );
 }

package/build/newsroom-context/hooks/useSelectedCategory.d.ts

@@ -1 +0,0 @@
-export declare const useSelectedCategory: () => import("@prezly/sdk").Category | undefined;

package/build/newsroom-context/hooks/useSelectedCategory.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSelectedCategory = void 0;
-var useNewsroomContext_1 = require("./useNewsroomContext");
-var useSelectedCategory = function () {
-    var context = (0, useNewsroomContext_1.useNewsroomContext)();
-    return context.selectedCategory;
-};
-exports.useSelectedCategory = useSelectedCategory;
-//# sourceMappingURL=useSelectedCategory.js.map

package/build/newsroom-context/hooks/useSelectedCategory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useSelectedCategory.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useSelectedCategory.ts"],"names":[],"mappings":";;;AAAA,2DAA0D;AAEnD,IAAM,mBAAmB,GAAG;IAC/B,IAAM,OAAO,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAErC,OAAO,OAAO,CAAC,gBAAgB,CAAC;AACpC,CAAC,CAAC;AAJW,QAAA,mBAAmB,uBAI9B"}

package/build/newsroom-context/hooks/useSelectedStory.d.ts

@@ -1 +0,0 @@
-export declare const useSelectedStory: () => import("@prezly/sdk").ExtendedStory | undefined;

package/build/newsroom-context/hooks/useSelectedStory.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"useSelectedStory.js","sourceRoot":"","sources":["../../../src/newsroom-context/hooks/useSelectedStory.ts"],"names":[],"mappings":";;;AAAA,2DAA0D;AAEnD,IAAM,gBAAgB,GAAG;IAC5B,IAAM,OAAO,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAErC,OAAO,OAAO,CAAC,aAAa,CAAC;AACjC,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B"}