@websolutespa/bom-mixer-hooks 1.9.2 → 1.9.4

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @websolutespa/bom-mixer-hooks
 
+## 1.9.4
+
+### Patch Changes
+
+- Added: IApp global
+- Updated dependencies
+  - @websolutespa/bom-mixer-models@1.10.3
+  - @websolutespa/bom-mixer-store@1.10.1
+  - @websolutespa/bom-core@1.8.24
+
+## 1.9.3
+
+### Patch Changes
+
+- 0c7f05f: Modified: useMetaData canonical
+- Updated dependencies [0c7f05f]
+- Updated dependencies [0c7f05f]
+  - @websolutespa/bom-mixer-models@1.10.1
+  - @websolutespa/bom-core@1.8.23
+
 ## 1.9.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import * as react from 'react';
 import react__default, { RefObject, Dispatch, SetStateAction, CSSProperties, MutableRefObject, ComponentProps, useEffect } from 'react';
 import { ApiRequestOptions } from '@websolutespa/bom-mixer-store';
 import * as _websolutespa_bom_core from '@websolutespa/bom-core';
-import { QueryParams, IEquatable, IFeatureType, ILabel, ILocalizable, ILayout, ILocalized, IPage } from '@websolutespa/bom-core';
+import { QueryParams, IEquatable, IFeatureType, ILabel, ILocalizable, ILayout, IAppExtended, ILocalized, IPage } from '@websolutespa/bom-core';
 import * as zustand from 'zustand';
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ILazyModules, IMetaData, StructuredDataType, OpenGraphType, TwitterCardType } from '@websolutespa/bom-mixer-models';
@@ -392,11 +392,12 @@ declare function parseLabel(dictionary: Record<string, ILocalizable | undefined>
 declare function parseParams(label: string, params: Record<string, any>): string;
 
 type ILayoutContext = ILayout;
-declare const useLayout: () => ILayout;
 declare function LayoutProvider({ children, layout }: {
     children?: react__default.ReactNode;
     layout: ILayout;
 }): react_jsx_runtime.JSX.Element;
+type UseLayout = <T extends IAppExtended = IAppExtended>() => ILayout<T>;
+declare const useLayout: UseLayout;
 
 type ILazyModulesContext = ILazyModules;
 declare const useLazyModules: () => ILazyModules;

package/dist/index.js

@@ -248,10 +248,11 @@ var createGenericContext = (defaultContext = null) => {
 
 // src/useLayout/useLayout.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
-var [useLayout, LayoutContextProvider] = createGenericContext();
+var [useLayout_, LayoutContextProvider] = createGenericContext();
 function LayoutProvider({ children, layout }) {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(LayoutContextProvider, { value: layout, children });
 }
+var useLayout = useLayout_;
 
 // src/useApi/useApi.ts
 function useApiFetch(pathname, options = {}) {
@@ -1536,9 +1537,13 @@ function MetaDataProvider({ children, metaData }) {
   const description = (0, import_html_to_text.convert)(((_b = page.meta) == null ? void 0 : _b.description) || page.abstract || "");
   const media = ((_c = page.meta) == null ? void 0 : _c.image) || page.media;
   const image = media ? (0, import_bom_mixer_models.resolveHref)(media.src || media.url) : brand.logo;
-  const canonical = (0, import_bom_mixer_models.resolveHref)(page.href);
+  let canonical = (0, import_bom_mixer_models.resolveHref)(page.href);
   const queryIndex = router.asPath.indexOf("?");
-  const url = `${canonical}${queryIndex !== -1 ? router.asPath.substring(queryIndex) : ""}`;
+  const query = queryIndex !== -1 ? router.asPath.substring(queryIndex) : "";
+  if (query.match(/^\?pagination\[page\]=(\d+)$/) && query !== "?pagination[page]=1") {
+    canonical = `${canonical}${query}`;
+  }
+  const url = `${canonical}${query}`;
   const alternates = (0, import_react26.useMemo)(() => {
     const alternates2 = [];
     page.alternates.forEach((alternate) => {
@@ -1615,6 +1620,12 @@ function MetaDataProvider({ children, metaData }) {
     },
     url: brand.url
     /*
+    description,
+    founder,
+    foundingDate,
+    numberOfEmployees,
+    */
+    /*
     foundingDate: '2020-01-01',
     numberOfEmployees: {
       '@type': 'QuantitativeValue',

package/dist/index.mjs

@@ -93,10 +93,11 @@ var createGenericContext = (defaultContext = null) => {
 
 // src/useLayout/useLayout.tsx
 import { jsx } from "react/jsx-runtime";
-var [useLayout, LayoutContextProvider] = createGenericContext();
+var [useLayout_, LayoutContextProvider] = createGenericContext();
 function LayoutProvider({ children, layout }) {
   return /* @__PURE__ */ jsx(LayoutContextProvider, { value: layout, children });
 }
+var useLayout = useLayout_;
 
 // src/useApi/useApi.ts
 function useApiFetch(pathname, options = {}) {
@@ -1381,9 +1382,13 @@ function MetaDataProvider({ children, metaData }) {
   const description = htmlToText(((_b = page.meta) == null ? void 0 : _b.description) || page.abstract || "");
   const media = ((_c = page.meta) == null ? void 0 : _c.image) || page.media;
   const image = media ? resolveHref(media.src || media.url) : brand.logo;
-  const canonical = resolveHref(page.href);
+  let canonical = resolveHref(page.href);
   const queryIndex = router.asPath.indexOf("?");
-  const url = `${canonical}${queryIndex !== -1 ? router.asPath.substring(queryIndex) : ""}`;
+  const query = queryIndex !== -1 ? router.asPath.substring(queryIndex) : "";
+  if (query.match(/^\?pagination\[page\]=(\d+)$/) && query !== "?pagination[page]=1") {
+    canonical = `${canonical}${query}`;
+  }
+  const url = `${canonical}${query}`;
   const alternates = useMemo5(() => {
     const alternates2 = [];
     page.alternates.forEach((alternate) => {
@@ -1460,6 +1465,12 @@ function MetaDataProvider({ children, metaData }) {
     },
     url: brand.url
     /*
+    description,
+    founder,
+    foundingDate,
+    numberOfEmployees,
+    */
+    /*
     foundingDate: '2020-01-01',
     numberOfEmployees: {
       '@type': 'QuantitativeValue',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-hooks",
-  "version": "1.9.2",
+  "version": "1.9.4",
   "description": "Mixer Hooks module of the BOM Repository",
   "keywords": [
     "bom",

package/src/useLayout/useLayout.tsx

@@ -1,10 +1,10 @@
-import { ILayout } from '@websolutespa/bom-core';
+import { IAppExtended, ILayout } from '@websolutespa/bom-core';
 import React from 'react';
 import { createGenericContext } from '../useGenericContext/useGenericContext';
 
 export type ILayoutContext = ILayout;
 
-const [useLayout, LayoutContextProvider] = createGenericContext<ILayoutContext>();
+const [useLayout_, LayoutContextProvider] = createGenericContext<ILayoutContext>();
 
 function LayoutProvider({ children, layout }: { children?: React.ReactNode, layout: ILayout }) {
   // console.log('LayoutProvider.context', context);
@@ -15,5 +15,12 @@ function LayoutProvider({ children, layout }: { children?: React.ReactNode, layo
   );
 }
 
-export { LayoutProvider, useLayout };
+type UseLayout = <T extends IAppExtended = IAppExtended>() => ILayout<T>;
+
+const useLayout:UseLayout = useLayout_ as UseLayout;
+
+export {
+  LayoutProvider,
+  useLayout
+};
 

package/src/useMetaData/useMetaData.tsx

@@ -48,9 +48,14 @@ function MetaDataProvider({ children, metaData }: {
   const description = htmlToText(page.meta?.description || page.abstract || '');
   const media = ((page.meta as { image: IMedia } | undefined)?.image || page.media);
   const image = media ? resolveHref(media.src || media.url) : brand.logo;
-  const canonical = resolveHref(page.href);
+  let canonical = resolveHref(page.href);
   const queryIndex = router.asPath.indexOf('?');
-  const url = `${canonical}${queryIndex !== -1 ? router.asPath.substring(queryIndex) : ''}`;
+  const query = queryIndex !== -1 ? router.asPath.substring(queryIndex) : '';
+  if (query.match(/^\?pagination\[page\]=(\d+)$/) && query !== '?pagination[page]=1') {
+    canonical = `${canonical}${query}`;
+    // title = `${title} - ${query.replace('?pagination[page]=','')}`;
+  }
+  const url = `${canonical}${query}`;
   const alternates = useMemo(() => {
     const alternates: IAlternate[] = [];
     page.alternates.forEach((alternate: IRoute) => {
@@ -127,6 +132,12 @@ function MetaDataProvider({ children, metaData }: {
     },
     url: brand.url,
     /*
+    description,
+    founder,
+    foundingDate,
+    numberOfEmployees,
+    */
+    /*
     foundingDate: '2020-01-01',
     numberOfEmployees: {
       '@type': 'QuantitativeValue',