@mybricks/to-code-taro 1.1.2 → 1.1.4

package/dist/cjs/handleSlot.js

@@ -31,7 +31,7 @@ var handleSlot = (ui, config) => {
   var _a, _b;
   const importManager = new import_utils.ImportManager(config);
   const { props = {} } = ui;
-  const children = ui.children || ui.comAry || [];
+  const children = (0, import_processChildren.normalizeChildren)(ui);
   const isRoot = config.checkIsRoot();
   const slotId = ((_a = ui.meta) == null ? void 0 : _a.id) || ui.id;
   const addDependencyImport = config.addParentDependencyImport || importManager.addImport.bind(importManager);
@@ -63,7 +63,7 @@ var handleSlot = (ui, config) => {
   const { initCode, effectCode } = (0, import_processSceneLogic.processSceneLogic)(ui, config, addDependencyImport);
   let cssContent = ((0, import_utils.convertStyleAryToCss)((_b = props.style) == null ? void 0 : _b.styleAry, slotId) || "") + (childResults.cssContent ? "\n" + childResults.cssContent : "");
   const combinedJsCode = `${envDefineCode}${childResults.js}${initCode}${(0, import_scene.wrapInEffect)(indent2, effectCode)}`;
-  const uiResult = generateSlotUi(ui, props, childResults.ui, config);
+  const uiResult = generateSlotUi(ui, props, childResults.ui, childResults.childrenResults, config);
   if (isRoot) {
     const renderDefinitions = renderManager ? renderManager.toCode("") : "";
     finalizeRootComponent(ui, config, importManager, combinedJsCode, renderDefinitions, uiResult, cssContent);
@@ -75,6 +75,7 @@ var handleSlot = (ui, config) => {
     cssContent,
     slots: [],
     scopeSlots: [],
+    directChildren: childResults.directChildren,
     childrenResults: childResults.childrenResults
   };
 };
@@ -95,19 +96,27 @@ var setupImports = (addImport, config, isRoot) => {
   addImport({ packageName: utilsPkg, dependencyNames, importType: "named" });
   addImport({ packageName: comPkg, dependencyNames: ["useAppContext"], importType: "named" });
   if (isRoot) {
+    addImport({ packageName: "@/common/pageLife", dependencyNames: ["usePageLife"], importType: "named" });
     if (config.hasPopups) {
-      addImport({ packageName: "../../common/popup", dependencyNames: ["POPUP_MAP", "POPUP_IDS"], importType: "named" });
+      addImport({ packageName: "@/common/popup", dependencyNames: ["POPUP_MAP", "POPUP_IDS"], importType: "named" });
     }
     addImport({ packageName: "./index.global.less", dependencyNames: [], importType: "module" });
   }
 };
-var generateSlotUi = (ui, props, childrenUi, config) => {
+var generateSlotUi = (ui, props, childrenUi, childrenResults, config) => {
   const indent = (0, import_utils.indentation)(config.codeStyle.indent * config.depth);
-  const mergedStyle = { width: "100%", height: "100%", ...ui.style || {}, ...props.style || {} };
+  const slotStyle = ui.style || {};
+  const propsStyle = props.style || {};
+  const mergedStyle = { width: "100%", height: "100%", ...slotStyle, ...propsStyle };
   const layout = config.layout || ui.layout || mergedStyle.layout;
-  const styleCode = JSON.stringify((0, import_utils.convertRootStyle)({ ...mergedStyle, layout }));
+  const smart = isSmartLayout(layout);
+  const layoutAdjustment = smart ? { position: isHasInSmartLayout(childrenResults) ? "fixed" : "relative" } : hasFixedChildren(childrenResults) ? { transform: "translateX(0)" } : {};
+  const styleCode = JSON.stringify((0, import_utils.convertRootStyle)({ ...mergedStyle, layout, ...layoutAdjustment }));
   const rootClassName = (0, import_utils.getRootComponentClassName)(config.getCurrentScene(), config.checkIsRoot());
-  const classNameAttr = rootClassName ? ` className='${rootClassName}'` : "";
+  const parentComId = config == null ? void 0 : config.parentComId;
+  const slotMarkClass = parentComId ? `slot-${parentComId}` : "";
+  const classNameStr = [rootClassName, slotMarkClass].filter(Boolean).join(" ");
+  const classNameAttr = classNameStr ? ` className='${classNameStr}'` : "";
   return `${indent}<View${classNameAttr} style={${styleCode}}>
 ${childrenUi}
 ${indent}</View>`;
@@ -128,4 +137,19 @@ var finalizeRootComponent = (ui, config, importManager, combinedJsCode, renderDe
   });
   config.add({ importManager, content: componentCode, cssContent, name: fileName });
 };
+var hasFixedChildren = (childrenResults) => {
+  return childrenResults.some((item) => {
+    var _a;
+    return ((_a = item == null ? void 0 : item.rootStyle) == null ? void 0 : _a.position) === "fixed";
+  });
+};
+var isSmartLayout = (layout) => {
+  return layout === "smart" || (layout == null ? void 0 : layout.position) === "smart";
+};
+var isHasInSmartLayout = (childrenResults) => {
+  return childrenResults.some((item) => {
+    var _a;
+    return ((_a = item == null ? void 0 : item.rootStyle) == null ? void 0 : _a.inSmartLayout) === true;
+  });
+};
 var handleSlot_default = handleSlot;