@webround/editor 0.3.2 → 0.3.4

package/dist/context/WrAppContext.js

@@ -2,6 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // packages/editor/src/context/WrAppContext.tsx
 import { createContext, useContext, useState, useCallback, useMemo, useEffect, useSyncExternalStore, lazy, Suspense } from 'react';
 import { createBrowserRouter, RouterProvider, useLocation, useParams } from 'react-router-dom';
+import { WrScroll } from '@webround/core/scroll';
 import { wrResolveRoutes, wrBuildRegistry, wrBuildLazyRegistry, wrBuildPageConfigMap, wrExpandRoutesForLangs, wrExtractLang, wrBuildLangPath, wrSharedScopes, } from '@webround/core/routing';
 import { WrPageProvider } from './WrPageContext';
 import { WrLayout } from './WrLayout';
@@ -55,7 +56,7 @@ function WrRouteElement({ route, lazyFallback: LazyFallback, Header, Footer, })
             const Component = route.Component;
             return _jsx(Component, {});
         })();
-    return (_jsxs(WrPageProvider, { config: config, pageName: pageName, file: file, children: [_jsx(WrSeoHead, { site: site, config: config, pathname: pathname, lang: lang, langs: langs }), _jsx(WrLayout, { Header: Header, Footer: Footer, showHeader: route.header, showFooter: route.footer, children: body })] }, pageName));
+    return (_jsxs(WrPageProvider, { config: config, pageName: pageName, file: file, children: [_jsx(WrScroll, {}), _jsx(WrSeoHead, { site: site, config: config, pathname: pathname, lang: lang, langs: langs }), _jsx(WrLayout, { Header: Header, Footer: Footer, showHeader: route.header, showFooter: route.footer, children: body })] }, pageName));
 }
 export function WrAppProvider({ routesFile, eagerModules, lazyModules, configModules, langs, initialLang = 'default', lazyFallback = WrDefaultPageFallback, Header, Footer, seo, shared, children, }) {
     // Config delle pagine: stato live, indipendente dal router.

package/dist/operations/ops/theme.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import postcss from 'postcss';
-import { WR_THEME_START_PROPERTY } from '@webround/core/theme';
+import { WR_THEME_START_PROPERTY, wrGoogleFamilyParam, wrGoogleWeightsOfParam } from '@webround/core/theme';
 import { defineOperation, invalid, object, requiredText } from '../define.js';
 // The site's theme: custom properties (`--wr-*`), Google fonts and custom fonts, all in `src/theme.css`. Read and written with postcss, so
 // what the user wrote around them stays as it was.
@@ -75,15 +75,12 @@ function parseGoogleImport(rule) {
     const entries = [];
     for (const family of url.searchParams.getAll('family')) {
         const [name, rest] = family.split(':');
-        const weights = rest?.startsWith('wght@') ? rest.slice('wght@'.length) : rest;
-        entries.push({ family: name.replace(/\+/g, ' '), weights });
+        entries.push({ family: name.replace(/\+/g, ' '), weights: wrGoogleWeightsOfParam(rest) });
     }
     return entries;
 }
 function buildGoogleImportRule(entries) {
-    const params = entries
-        .map(({ family, weights }) => `family=${family.replace(/ /g, '+')}${weights ? `:wght@${weights}` : ''}`)
-        .join('&');
+    const params = entries.map(({ family, weights }) => wrGoogleFamilyParam(family, weights)).join('&');
     return `url('https://fonts.googleapis.com/css2?${params}&display=swap')`;
 }
 function getThemeItems(root) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webround/editor",
-    "version": "0.3.2",
+    "version": "0.3.4",
     "type": "module",
     "main": "./dist/index.js",
     "module": "./dist/index.js",
@@ -65,7 +65,7 @@
         "@lexical/selection": "^0.51.0",
         "@lexical/utils": "^0.51.0",
         "@monaco-editor/react": "^4.7.0",
-        "@webround/core": "^0.3.0",
+        "@webround/core": "^0.3.4",
         "highlight.js": "^11.12.0",
         "hls.js": "^1.5.0",
         "lexical": "^0.51.0",