From f85e73706a18c3ba53f147ef1f859db95a7f420e Mon Sep 17 00:00:00 2001 From: Sanghyeon Lee Date: Wed, 16 Jun 2021 20:32:51 +0900 Subject: [PATCH] Fix size calculation by checking sign --- cssinjs-inlclude-media.ts | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/cssinjs-inlclude-media.ts b/cssinjs-inlclude-media.ts index 3a7dfbd..a98b448 100644 --- a/cssinjs-inlclude-media.ts +++ b/cssinjs-inlclude-media.ts @@ -75,12 +75,21 @@ function parseParam(param: string) { return [sign, screenSize]; } +function calculateSize(sign: string, screenSize: string) { + if (sign.includes("=")) { + return breakpoints[screenSize]; + } + + if (sign.includes(">")) { + return breakpoints[screenSize] + 1; + } + + return breakpoints[screenSize] - 1; +} + function convertToQuery(param: string) { const [sign, screenSize] = parseParam(param); - const hasEqualSign = sign.includes("="); - const size = hasEqualSign - ? breakpoints[screenSize] - : breakpoints[screenSize] - 1; + const size = calculateSize(sign, screenSize); const unit = typeof size === "number" ? "px" : ""; const widthCondition = sign.includes(">") ? "min-width" : "max-width"; return `(${widthCondition}: ${size}${unit})`;