fix: font-size not applied. refs #58

walkframe · Aug 8, 2024 · da10ca1 · da10ca1
1 parent c2d1c37
commit da10ca1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/.storybook/examples/basic/style.stories.tsx b/.storybook/examples/basic/style.stories.tsx
@@ -31,7 +31,10 @@ export const Style = () => {
             A: {
             },
             B: {
-              style: { backgroundColor: "#eeeeee" },
+              style: { 
+                backgroundColor: "#eeeeee", 
+                fontSize: 30, color: "#fff", fontFamily: 'fantasy', letterSpacing: 20, lineHeight: "60px",
+              },
               width: 200,
             },
             C: {

diff --git a/src/components/SheetProvider.tsx b/src/components/SheetProvider.tsx
@@ -28,7 +28,7 @@ export function useSheetDispatch() {
   return dispatch;
 }
 
-export function SheetProvider({ children }: { children: JSX.Element }) {
+export function SheetProvider({ children }: { children: React.ReactNode }) {
   const [mounted, setMounted] = React.useState(false);
   const [version, setVersion] = React.useState(0);
   const head = React.useRef(1);

diff --git a/src/styles/cell.less b/src/styles/cell.less
@@ -6,6 +6,10 @@
   margin: 0;
   box-sizing: border-box;
   position: relative;
+  font-size: 13px;
+  letter-spacing: 1px;
+  line-height: 24px;
+
   &.gs-copying {
     textarea:focus {
       outline: solid 1px #0077ff;
@@ -51,13 +55,16 @@
     z-index: 1;
   }
   .gs-cell-label {
+    font-size: 8px;
+    font-weight: normal;
+    font-style: normal;
     font-family: monospace, serif;
+    letter-spacing: 1px;
+    line-height: 18px;
+
     position: absolute;
     top: 0;
     right: 0;
-    font-size: 8px;
-    font-weight: normal;
-    font-style: normal;
     background-color: rgba(0, 128, 255, 0.2);
     color: rgba(255, 255, 255, 0.6);
     padding: 0 2px;
@@ -81,10 +88,7 @@
 
   .gs-cell-rendered {
     overflow: hidden;
-    font-size: 13px;
-    letter-spacing: 1px;
     white-space: pre-wrap;
-    line-height: 24px;
     cursor: auto;
     word-wrap: break-word;
     word-break: break-all;