pds-dev-kit-web-test 0.2.50 → 0.2.53

package/dist/src/sub/DynamicLayout/DynamicLayout.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import type { DynamicLayoutProps } from './types';
-declare function DynamicLayout({ device, mode, isPreview, sections, scrollDownTargetSectionId, editingSectionId, navigationHandler, sectionActionHandler, onClickEditSection, programmedSectionComponents, config }: DynamicLayoutProps): JSX.Element;
+declare function DynamicLayout({ device, mode, isPreview, sections, scrollDownTargetSectionId, editingSectionId, navigationHandler, sectionActionHandler, onClickEditSection, programmedSectionComponents }: DynamicLayoutProps): JSX.Element;
 export default DynamicLayout;

package/dist/src/sub/DynamicLayout/DynamicLayout.js

@@ -25,7 +25,7 @@ var EditModeSectionMatcher_1 = require("./components/EditModeSectionMatcher");
 var SectionMatcher_1 = require("./components/SectionMatcher");
 var dynamicLayoutContext_1 = require("./dynamicLayoutContext");
 function DynamicLayout(_a) {
-    var device = _a.device, _b = _a.mode, mode = _b === void 0 ? 'NORMAL' : _b, isPreview = _a.isPreview, sections = _a.sections, scrollDownTargetSectionId = _a.scrollDownTargetSectionId, editingSectionId = _a.editingSectionId, navigationHandler = _a.navigationHandler, sectionActionHandler = _a.sectionActionHandler, onClickEditSection = _a.onClickEditSection, programmedSectionComponents = _a.programmedSectionComponents, config = _a.config;
+    var device = _a.device, _b = _a.mode, mode = _b === void 0 ? 'NORMAL' : _b, isPreview = _a.isPreview, sections = _a.sections, scrollDownTargetSectionId = _a.scrollDownTargetSectionId, editingSectionId = _a.editingSectionId, navigationHandler = _a.navigationHandler, sectionActionHandler = _a.sectionActionHandler, onClickEditSection = _a.onClickEditSection, programmedSectionComponents = _a.programmedSectionComponents;
     var filteredSortedSection = __spreadArray([], sections, true).filter(function (section) { return section.display; })
         .sort(function (a, b) { return a.order - b.order; });
     var iframeSection = filteredSortedSection.find(function (section) { return section.manifest.schema === 'EXP_IFRAME' && section.display; });
@@ -36,8 +36,7 @@ function DynamicLayout(_a) {
             navigationHandler: navigationHandler,
             sectionActionHandler: sectionActionHandler,
             editingSectionId: editingSectionId,
-            programmedSectionComponents: programmedSectionComponents,
-            config: config
+            programmedSectionComponents: programmedSectionComponents
         } }, { children: [mode === 'EDIT' && onClickEditSection && ((0, jsx_runtime_1.jsx)(EditModeSectionMatcher_1.EditModeSectionMatcher, { editingSectionId: editingSectionId, scrollDownTargetSectionId: scrollDownTargetSectionId, filteredSortedSection: filteredSortedSection, onClickEditSection: onClickEditSection })), mode !== 'EDIT' &&
                 (iframeSection ? ((0, jsx_runtime_1.jsx)(SectionMatcher_1.SectionMatcher, __assign({}, iframeSection), iframeSection.id)) : (filteredSortedSection.map(function (section) { return (0, jsx_runtime_1.jsx)(SectionMatcher_1.SectionMatcher, __assign({}, section), section.id); })))] })));
 }

package/dist/src/sub/DynamicLayout/dynamicLayoutContext.js

@@ -4,8 +4,5 @@ exports.dynamicLayoutContext = void 0;
 var react_1 = require("react");
 exports.dynamicLayoutContext = (0, react_1.createContext)({
     device: 'DESKTOP',
-    mode: 'NORMAL',
-    config: {
-        googleFontsApiKey: ''
-    }
+    mode: 'NORMAL'
 });

package/dist/src/sub/DynamicLayout/sections/CustomSection/components/ComponentBlock/componentBlocks/Text/useGoogleFonts.js

@@ -4,15 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
-var dynamicLayoutContext_1 = require("../../../../../../../DynamicLayout/dynamicLayoutContext");
 var callGoogleFontCSSAndApply_1 = __importDefault(require("../../../../../../../GoogleFontkit/utils/callGoogleFontCSSAndApply"));
 function useGoogleFonts(_a) {
     var fonts = _a.fonts;
-    var googleFontsApiKey = (0, react_1.useContext)(dynamicLayoutContext_1.dynamicLayoutContext).config.googleFontsApiKey;
     (0, react_1.useEffect)(function () {
         fonts.forEach(function (fontFamily) {
             var parsedFontFamily = fontFamily.substring(7);
-            (0, callGoogleFontCSSAndApply_1.default)(googleFontsApiKey, parsedFontFamily);
+            (0, callGoogleFontCSSAndApply_1.default)(parsedFontFamily);
         });
     }, [fonts]);
 }

package/dist/src/sub/DynamicLayout/types.d.ts

@@ -224,9 +224,6 @@ export type DynamicLayoutProps = {
     sectionActionHandler?: (action: TypeOfSectionAction) => void;
     programmedSectionComponents?: IProgrammedSectionComponents;
     width?: number;
-    config: {
-        googleFontsApiKey: string;
-    };
 };
 export type NavHandlerAction = {
     openNewTab: boolean;

package/dist/src/sub/GoogleFontkit/GoogleFontApplyExample.js

@@ -18,12 +18,11 @@ var jsx_runtime_1 = require("react/jsx-runtime");
 var react_1 = require("react");
 var getGoogleFontDefaultText_1 = __importDefault(require("./api/getGoogleFontDefaultText"));
 var callGoogleFontCSSAndApply_1 = __importDefault(require("./utils/callGoogleFontCSSAndApply"));
-var GOOGLE_FONT_API_KEY = 'AIzaSyDvOkXcd-jqqD1z1P-RmIBM9RzGpEXRwV0';
 function TextCB(_a) {
     var text = _a.text, font = _a.font;
     var _b = (0, react_1.useState)(text), defaultText = _b[0], setDefaultText = _b[1];
     (0, react_1.useEffect)(function () {
-        (0, callGoogleFontCSSAndApply_1.default)(GOOGLE_FONT_API_KEY, font);
+        (0, callGoogleFontCSSAndApply_1.default)(font);
         (0, getGoogleFontDefaultText_1.default)(font).then(function (data) {
             setDefaultText(data.sampleText.tester);
         });

package/dist/src/sub/GoogleFontkit/headless/GoogleFontsList.js

@@ -50,6 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable no-console */
 var react_1 = require("react");
 var getGoogleWebFonts_1 = __importDefault(require("../api/getGoogleWebFonts"));
 var getFontId_1 = __importDefault(require("../utils/getFontId"));
@@ -96,21 +97,26 @@ function GoogleFontsList(_a) {
     (0, react_1.useEffect)(function () {
         function getFilteredFontsAsync() {
             return new Promise(function (resolve) {
-                var filteredFonts = fonts.filter(function (font) {
-                    var categories = filterOptions.categories, searchQuery = filterOptions.searchQuery, subsets = filterOptions.subsets;
-                    var isSelectedCategory = categories.includes(font.category);
-                    var query = searchQuery.toLocaleLowerCase().trim();
-                    var matchSearchQuery = font.family.toLocaleLowerCase().includes(query);
-                    if (!matchSearchQuery) {
+                console.log('filter start (1)');
+                setTimeout(function () {
+                    var filteredFonts = fonts.filter(function (font) {
+                        var categories = filterOptions.categories, searchQuery = filterOptions.searchQuery, subsets = filterOptions.subsets;
+                        var isSelectedCategory = categories.includes(font.category);
+                        var query = searchQuery.toLocaleLowerCase().trim();
+                        var matchSearchQuery = font.family.toLocaleLowerCase().includes(query);
+                        if (!matchSearchQuery) {
+                            return false;
+                        }
+                        var hasSomeScript = subsets.length > 0 ? font.subsets.some(function (subset) { return subsets.includes(subset); }) : true;
+                        if (isSelectedCategory && hasSomeScript) {
+                            return true;
+                        }
                         return false;
-                    }
-                    var hasSomeScript = subsets.length > 0 ? font.subsets.some(function (subset) { return subsets.includes(subset); }) : true;
-                    if (isSelectedCategory && hasSomeScript) {
-                        return true;
-                    }
-                    return false;
-                });
-                resolve(filteredFonts);
+                    });
+                    resolve(filteredFonts);
+                    console.log('filter resolved (3)');
+                }, 0);
+                console.log('after filter (2)');
             });
         }
         setIsLoading(true);

package/dist/src/sub/GoogleFontkit/types.d.ts

@@ -36,7 +36,7 @@ export type FilterOptionHandlerArgType = {
     name: 'subsets';
     value: Subset[];
 };
-export type ChangeFilterOptionHandler = (arg: FilterOptionHandlerArgType) => void;
+export type ChangeFilterOptionHandler = (arg: FilterOptionHandlerArgType, setLoading?: boolean) => void;
 export type FilterOptionType = {
     searchQuery: string;
     categories: Category[];

package/dist/src/sub/GoogleFontkit/utils/callGoogleFontCSSAndApply.d.ts

@@ -1,2 +1,2 @@
-declare function callGoogleFontCSSAndApply(key: string, fontFamily: string): Promise<void>;
+declare function callGoogleFontCSSAndApply(fontFamily: string): Promise<void>;
 export default callGoogleFontCSSAndApply;

package/dist/src/sub/GoogleFontkit/utils/callGoogleFontCSSAndApply.js

@@ -40,41 +40,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var getGoogleFontCss_1 = __importDefault(require("../api/getGoogleFontCss"));
-var getGoogleWebFonts_1 = __importDefault(require("../api/getGoogleWebFonts"));
 var createStyleSheet_1 = __importDefault(require("./createStyleSheet"));
 var extractFontStyles_1 = __importDefault(require("./extractFontStyles"));
 var fillStyleSheet_1 = __importDefault(require("./fillStyleSheet"));
 var getFontId_1 = __importDefault(require("./getFontId"));
 var isStyleSheetExists_1 = __importDefault(require("./isStyleSheetExists"));
-var parseFontVariants_1 = __importDefault(require("./parseFontVariants"));
-function callGoogleFontCSSAndApply(key, fontFamily) {
+function callGoogleFontCSSAndApply(fontFamily) {
     return __awaiter(this, void 0, void 0, function () {
-        var items, font, css, fontStyles;
+        var fontId, css, fontStyles;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, getGoogleWebFonts_1.default)({
-                        key: key,
-                        family: fontFamily
-                    })];
-                case 1:
-                    items = (_a.sent()).items;
-                    font = items[0];
-                    font.id = (0, getFontId_1.default)(font.family);
-                    if ((0, isStyleSheetExists_1.default)(font.id)) {
+                case 0:
+                    fontId = (0, getFontId_1.default)(fontFamily);
+                    if ((0, isStyleSheetExists_1.default)(fontId)) {
                         return [2 /*return*/];
                     }
-                    (0, createStyleSheet_1.default)(font.id, false);
+                    (0, createStyleSheet_1.default)(fontId, false);
                     return [4 /*yield*/, (0, getGoogleFontCss_1.default)({
-                            family: "".concat(font.family).concat((0, parseFontVariants_1.default)(font.variants, {
-                                prefix: ':wght@',
-                                separator: ';'
-                            })),
+                            family: "".concat(fontFamily, ":wght@100;200;300;400;500;700;800;900"),
                             'font-display': 'swap'
                         })];
-                case 2:
+                case 1:
                     css = _a.sent();
                     fontStyles = (0, extractFontStyles_1.default)(css);
-                    (0, fillStyleSheet_1.default)(font.id, fontStyles[font.id]);
+                    (0, fillStyleSheet_1.default)(fontId, fontStyles[fontId]);
                     return [2 /*return*/];
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pds-dev-kit-web-test",
-  "version": "0.2.50",
+  "version": "0.2.53",
   "license": "MIT",
   "private": false,
   "main": "dist/index.js",

package/release-note.md

@@ -1,7 +1,7 @@
 # pds-dev-kit-web-test Release Notes
-## [v0.2.50]
+## [v0.2.53]
 ## 기준 pds-dev-kit-web 버전 @2.2.10
 ### sub
     * GoogleFontKit
-        * DL에 API-KEY를 받도록 추가
+        * font weight 400 추가
         * 성능 개선 시도