From 99796a1133edd51363f64d739e3e0f5941196f24 Mon Sep 17 00:00:00 2001
From: Makoto Yamada <woocie.rugby@gmail.com>
Date: Fri, 10 Sep 2021 08:15:40 +0900
Subject: [PATCH 1/2] add 'px' complement to getSizeFromBreakpoint

---
 src/index.d.ts | 8 ++++----
 src/index.js   | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/index.d.ts b/src/index.d.ts
index b67c032..4749472 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -44,10 +44,10 @@ export interface MediaGenerator<Breakpoints, Theme> {
 // --
 
 export interface DefaultBreakpoints {
-  huge: string;
-  large: string;
-  medium: string;
-  small: string;
+  huge: string | number;
+  large: string | number;
+  medium: string | number;
+  small: string | number;
 }
 
 export const defaultBreakpoints: DefaultBreakpoints;
diff --git a/src/index.js b/src/index.js
index 4fba0a5..22ecd64 100644
--- a/src/index.js
+++ b/src/index.js
@@ -18,7 +18,9 @@ export const defaultBreakpoints = {
 };
 
 function getSizeFromBreakpoint(breakpointValue, breakpoints = {}) {
-  if (breakpoints[breakpointValue]) {
+  if (typeof breakpoints[breakpointValue] === "number") {
+    return breakpoints[breakpointValue] + "px";
+  } else if (breakpoints[breakpointValue]) {
     return breakpoints[breakpointValue];
   } else if (parseInt(breakpointValue)) {
     return breakpointValue;

From 7c6de54c97b8659800fa529ae8966b1d2deea849 Mon Sep 17 00:00:00 2001
From: Makoto Yamada <woocie.rugby@gmail.com>
Date: Fri, 10 Sep 2021 08:16:30 +0900
Subject: [PATCH 2/2] enable to convert number

---
 src/convertors.js |  2 +-
 src/index.d.ts    | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/convertors.js b/src/convertors.js
index 1fdf299..6718b33 100644
--- a/src/convertors.js
+++ b/src/convertors.js
@@ -10,7 +10,7 @@ function pxToEmOrRem(breakpoints, ratio = 16, unit) {
   for (let key in breakpoints) {
     const point = breakpoints[key];
 
-    if (String(point).includes('px')) {
+    if (typeof point === 'number' || String(point).includes('px')) {
       newBreakpoints[key] = +(parseInt(point) / ratio) + unit;
       continue;
     }
diff --git a/src/index.d.ts b/src/index.d.ts
index 4749472..4c0a668 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -66,5 +66,11 @@ export default media;
 
 // Convertors --
 
-export function pxToEm<B>(breakpoints: B, ratio?: number): B;
-export function pxToRem<B>(breakpoints: B, ratio?: number): B;
+export function pxToEm<B extends DefaultBreakpoints>(
+  breakpoints: B,
+  ratio?: number
+): B;
+export function pxToRem<B extends DefaultBreakpoints>(
+  breakpoints: B,
+  ratio?: number
+): B;