@unocss/preset-wind 0.47.6 → 0.48.1

package/dist/index.cjs

@@ -295,24 +295,40 @@ const queryMatcher = /@media \(min-width: (.+)\)/;
 const container = [
   [
     /^__container$/,
-    (m, { theme, variantHandlers }) => {
+    (m, context) => {
+      const { theme, variantHandlers } = context;
       let width = "100%";
+      const themePadding = theme.container?.padding;
+      let padding;
+      if (typeof themePadding === "string")
+        padding = themePadding;
+      else
+        padding = themePadding?.DEFAULT;
       for (const v of variantHandlers) {
         const query = v.handle?.({}, (x) => x)?.parent;
         if (typeof query === "string") {
           const match = query.match(queryMatcher)?.[1];
-          if (match)
+          if (match) {
             width = match;
+            const bp = utils.resolveBreakpoints(context) ?? {};
+            const matchBp = Object.keys(bp).find((key) => bp[key] === match);
+            if (matchBp && typeof themePadding !== "string")
+              padding = themePadding?.[matchBp] ?? padding;
+          }
         }
       }
+      const css = {
+        "max-width": width
+      };
       if (theme.container?.center) {
-        return {
-          "max-width": width,
-          "margin-left": "auto",
-          "margin-right": "auto"
-        };
+        css["margin-left"] = "auto";
+        css["margin-right"] = "auto";
+      }
+      if (themePadding) {
+        css["padding-left"] = padding;
+        css["padding-right"] = padding;
       }
-      return { "max-width": width };
+      return css;
     },
     { internal: true }
   ]
@@ -1165,6 +1181,7 @@ const presetWind = (options = {}) => {
     shortcuts,
     variants: variants(options),
     options,
+    postprocess: options.variablePrefix && options.variablePrefix !== "un-" ? presetMini.VarPrefixPostprocessor(options.variablePrefix) : void 0,
     preflights: options.preflight ? presetMini.preflights : [],
     prefix: options.prefix
   };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { preflights } from '@unocss/preset-mini';
+import { VarPrefixPostprocessor, preflights } from '@unocss/preset-mini';
 export { colors, preflights } from '@unocss/preset-mini';
 import { handler, globalKeywords, makeGlobalStaticRules, positionMap, parseColor, colorToString, colorOpacityToString, colorResolver, resolveBreakpoints, colorableShadows, directionMap, directionSize, variantMatcher, variantParentMatcher, hasParseableColor } from '@unocss/preset-mini/utils';
 import { varEmpty, borderStyles, handlerBorderStyle, cssVariables as cssVariables$1, cssProperty, pointerEvents, appearances, positions, insets, zIndexes, orders, grids, floats, margins, boxSizing, displays, aspectRatio, sizes, flex, transforms, cursors, userSelects, resizes, appearance, placements, alignments, justifies, gaps, overflows, textOverflows, whitespaces, breaks, borders, bgColors, svgUtilities, paddings, textAligns, textIndents, verticalAligns, fonts, textTransforms as textTransforms$1, fontStyles, textColors, textDecorations, fontSmoothings, tabSizes, textStrokes, textShadows, opacity, boxShadows, outline, rings, transitions, willChange, contentVisibility, contents, containerParent, questionMark, transformBase, boxShadowsBase, ringBase } from '@unocss/preset-mini/rules';
@@ -292,24 +292,40 @@ const queryMatcher = /@media \(min-width: (.+)\)/;
 const container = [
   [
     /^__container$/,
-    (m, { theme, variantHandlers }) => {
+    (m, context) => {
+      const { theme, variantHandlers } = context;
       let width = "100%";
+      const themePadding = theme.container?.padding;
+      let padding;
+      if (typeof themePadding === "string")
+        padding = themePadding;
+      else
+        padding = themePadding?.DEFAULT;
       for (const v of variantHandlers) {
         const query = v.handle?.({}, (x) => x)?.parent;
         if (typeof query === "string") {
           const match = query.match(queryMatcher)?.[1];
-          if (match)
+          if (match) {
             width = match;
+            const bp = resolveBreakpoints(context) ?? {};
+            const matchBp = Object.keys(bp).find((key) => bp[key] === match);
+            if (matchBp && typeof themePadding !== "string")
+              padding = themePadding?.[matchBp] ?? padding;
+          }
         }
       }
+      const css = {
+        "max-width": width
+      };
       if (theme.container?.center) {
-        return {
-          "max-width": width,
-          "margin-left": "auto",
-          "margin-right": "auto"
-        };
+        css["margin-left"] = "auto";
+        css["margin-right"] = "auto";
+      }
+      if (themePadding) {
+        css["padding-left"] = padding;
+        css["padding-right"] = padding;
       }
-      return { "max-width": width };
+      return css;
     },
     { internal: true }
   ]
@@ -1162,6 +1178,7 @@ const presetWind = (options = {}) => {
     shortcuts,
     variants: variants(options),
     options,
+    postprocess: options.variablePrefix && options.variablePrefix !== "un-" ? VarPrefixPostprocessor(options.variablePrefix) : void 0,
     preflights: options.preflight ? preflights : [],
     prefix: options.prefix
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unocss/preset-wind",
-  "version": "0.47.6",
+  "version": "0.48.1",
   "description": "Tailwind / Windi CSS compact preset for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -35,8 +35,8 @@
     "*.css"
   ],
   "dependencies": {
-    "@unocss/core": "0.47.6",
-    "@unocss/preset-mini": "0.47.6"
+    "@unocss/core": "0.48.1",
+    "@unocss/preset-mini": "0.48.1"
   },
   "scripts": {
     "build": "unbuild",