fix regression with generateId logic introduced a few commits back

kof · kof · commit 76a557385741 · 2021-06-28T14:41:26.000+02:00
diff --git a/packages/react-jss/.size-snapshot.json b/packages/react-jss/.size-snapshot.json
@@ -1,23 +1,23 @@
 {
   "react-jss.js": {
-    "bundled": 137310,
-    "minified": 49961,
-    "gzipped": 16692
+    "bundled": 137345,
+    "minified": 49988,
+    "gzipped": 16699
   },
   "react-jss.min.js": {
-    "bundled": 104260,
-    "minified": 39820,
-    "gzipped": 13800
+    "bundled": 104295,
+    "minified": 39847,
+    "gzipped": 13806
   },
   "react-jss.cjs.js": {
-    "bundled": 21942,
-    "minified": 9456,
-    "gzipped": 3163
+    "bundled": 21977,
+    "minified": 9483,
+    "gzipped": 3168
   },
   "react-jss.esm.js": {
-    "bundled": 20053,
-    "minified": 7975,
-    "gzipped": 2948,
+    "bundled": 20088,
+    "minified": 8002,
+    "gzipped": 2953,
     "treeshaked": {
       "rollup": {
         "code": 426,
diff --git a/packages/react-jss/src/utils/sheets.js b/packages/react-jss/src/utils/sheets.js
@@ -55,7 +55,10 @@ function getSheetOptions<Theme>(options: Options<Theme>, link: boolean) {
     meta,
     classNamePrefix,
     link,
-    generateId: options.sheetOptions ? options.sheetOptions.generateId : options.context.generateId
+    generateId:
+      options.sheetOptions && options.sheetOptions.generateId
+        ? options.sheetOptions.generateId
+        : options.context.generateId
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,10 @@ function getSheetOptions<Theme>(options: Options<Theme>, link: boolean) {`
`55`	`55`	`meta,`
`56`	`56`	`classNamePrefix,`
`57`	`57`	`link,`
`58`		`- generateId: options.sheetOptions ? options.sheetOptions.generateId : options.context.generateId`
	`58`	`+ generateId:`
	`59`	`+ options.sheetOptions && options.sheetOptions.generateId`
	`60`	`+ ? options.sheetOptions.generateId`
	`61`	`+ : options.context.generateId`
`59`	`62`	`}`
`60`	`63`	`}`
`61`	`64`