nodoku-core 0.2.0 → 0.2.1

package/esm/core/rendering-page.jsx

@@ -5,6 +5,7 @@ import { DummyComp } from "./dummy-comp";
 import yaml from "js-yaml";
 import fs from "node:fs";
 import { mergeTheme } from "../theme-utils/theme-merger";
+import { defaultRowThemeImpl } from "../theme-utils/row-style";
 async function defaultComponentResolver() {
     const compoDef = new NdComponentDefinition("unlimited", undefined, {});
     return { compo: DummyComp, compoDef: compoDef };
@@ -36,7 +37,7 @@ function generateSkinByContentBlocks(blocks, skin) {
     let currentRow = undefined;
     const res = new NdPageSkin();
     let rowIndex = 0;
-    blocks.map((b, i) => {
+    blocks.map((b) => {
         if (!rendered.has(b.id)) {
             const bRows = skin.rows.filter(r => r.components.filter(c => c.selector.match(b)).length > 0);
             if (bRows.length > 0) {
@@ -76,7 +77,7 @@ async function createRow(row, iRow, blocks, lng, imageProvider, i18nProvider, co
         return <></>;
     }
     const numComponents = rowComponents.length;
-    const rowEffectiveTheme = mergeTheme(row?.theme, NdRow.defaultRowTheme);
+    const rowEffectiveTheme = mergeTheme(row?.theme, defaultRowThemeImpl);
     const maxCols = row?.maxCols ? row.maxCols : 3;
     const numCols = numComponents <= maxCols ? numComponents : maxCols;
     let gridCols = "grid-cols-1";
@@ -136,7 +137,9 @@ async function createRow(row, iRow, blocks, lng, imageProvider, i18nProvider, co
         rowDisplay = "flex flex-row justify-center flex-wrap flex-1";
     }
     return (<div key={`row-${iRow}`} className={`${rowDisplay} ${rowEffectiveTheme?.base} ${rowEffectiveTheme?.decoration} class-row-${iRow}`}>
-            {rowComponents.map(c => <div className={`nd-component-holder basis-full ${flexBasis} ${rowEffectiveTheme.componentHolder?.base} ${rowEffectiveTheme.componentHolder?.decoration}`} style={{ minWidth: 0, overflow: "hidden" }}>{c}</div>)}
+            {rowComponents.map((c) => <div className={`nd-component-holder ${flexBasis} ${rowEffectiveTheme.componentHolder?.base} ${rowEffectiveTheme.componentHolder?.decoration}`}>
+                        {c}
+                    </div>)}
         </div>);
 }
 async function createRowComponents(rowIndex, blockIndex, skinComponent, pageContent, lng, imageProvider, i18nProvider, componentResolver) {

package/esm/index.js

@@ -3,9 +3,16 @@ import { NdSkinComponent, NdRow, NdPageSkin, NdSkinComponentProps, NdContentSele
 import { RenderingPageProps, RenderingPriority } from "./core/rendering-page-props";
 import { RenderingPage } from "./core/rendering-page";
 import { mergeTheme } from "./theme-utils/theme-merger";
+import { defaultRowThemeImpl } from "./theme-utils/row-style";
 export { NdContentImage, NdTranslatableText, NdList, NdCode, NdContentBlock, NdSkinComponent, NdRow, NdPageSkin, NdSkinComponentProps, NdContentSelector, NdComponentDefinition, NdThemeHierarchy };
 export { RenderingPageProps, RenderingPriority, RenderingPage };
 export { mergeTheme };
 export { DummyComp } from "./core/dummy-comp";
 export { contentMarkdownProvider, parseMarkdownAsContent } from "./providers/content/content-markdown-provider";
 export { skinYamlProvider, parseYamlContentAsSkin } from "./providers/skin/skin-yaml-provider";
+export const ts = function (t, key) {
+    const themeStyle = t[key];
+    const k = key;
+    return k + " " + themeStyle?.base + " " + themeStyle?.decoration;
+};
+export const defaultRowTheme = defaultRowThemeImpl;

package/esm/skin/nd-skin.js

@@ -72,15 +72,6 @@ export class NdRow {
     constructor(rowIndex) {
         this.rowIndex = rowIndex;
     }
-    static defaultRowTheme = {
-        base: "md:grid-cols-1",
-        decoration: "gap-4",
-        rowDisplay: "grid",
-        componentHolder: {
-            base: "min-w-0 overflow-hidden",
-            decoration: ""
-        },
-    };
 }
 export class NdPageSkin {
     renderingPage;

package/esm/theme-utils/row-style.js

@@ -1 +1,9 @@
-export {};
+export const defaultRowThemeImpl = {
+    base: "md:grid-cols-1",
+    decoration: "gap-4",
+    rowDisplay: "grid",
+    componentHolder: {
+        base: "min-w-0 overflow-hidden",
+        decoration: ""
+    },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodoku-core",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "basic foundation for nodoku static site generator",
   "exports": {
     ".": {

package/types/index.d.ts

@@ -7,6 +7,7 @@ import { mergeTheme } from "./theme-utils/theme-merger";
 import { ThemeStyle } from "./theme-utils/theme-style";
 import { ExtendedThemeStyle } from "./theme-utils/extended-theme-style";
 import { ImageStyle } from "./theme-utils/image-style";
+import { RowStyle } from "./theme-utils/row-style";
 export { NdContentImage, NdTranslatableText, NdList, NdCode, NdContentBlock, NdSkinComponent, NdRow, NdPageSkin, NdSkinComponentProps, NdContentSelector, NdComponentDefinition, NdThemeHierarchy, type NdDefaultThemeName, type NdImageProps };
 export { RenderingPageProps, RenderingPriority, RenderingPage };
 export { mergeTheme, type ThemeStyle, type ExtendedThemeStyle, type ImageStyle };
@@ -14,3 +15,5 @@ export type { I18nextProvider, AsyncFunctionComponent, ImageProvider };
 export { DummyComp } from "./core/dummy-comp";
 export { contentMarkdownProvider, parseMarkdownAsContent } from "./providers/content/content-markdown-provider";
 export { skinYamlProvider, parseYamlContentAsSkin } from "./providers/skin/skin-yaml-provider";
+export declare const ts: <T>(t: T, key: keyof T) => string;
+export declare const defaultRowTheme: RowStyle;

package/types/skin/nd-skin.d.ts

@@ -32,10 +32,9 @@ export declare class NdSkinComponent {
 export declare class NdRow {
     rowIndex: number;
     maxCols?: number;
-    theme: RowStyle | undefined;
+    theme?: RowStyle;
     components: NdSkinComponent[];
     constructor(rowIndex: number);
-    static defaultRowTheme: RowStyle;
 }
 export declare class NdPageSkin {
     renderingPage: ThemeStyle | undefined;

package/types/theme-utils/row-style.d.ts

@@ -3,3 +3,4 @@ export type RowStyle = ThemeStyle & {
     rowDisplay?: "flex" | "grid";
     componentHolder?: ThemeStyle;
 };
+export declare const defaultRowThemeImpl: RowStyle;