fix(ods): forward style correctly to allow @use usage

ovh · Jul 29, 2024 · 892aa53 · 892aa53
1 parent 57f9aab
commit 892aa53
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 41 deletions.
diff --git a/packages/examples/react-webpack/src/app/App.tsx b/packages/examples/react-webpack/src/app/App.tsx
@@ -1,8 +1,7 @@
 import React, { useEffect, useState } from 'react';
-import { ODS_SPINNER_SIZE, ODS_TEXT_PRESET } from '@ovhcloud/ods-components';
-import { OdsSpinner, OdsText } from '@ovhcloud/ods-components/react';
+import { ODS_SPINNER_SIZE } from '@ovhcloud/ods-components';
+import { OdsSpinner } from '@ovhcloud/ods-components/react';
 import { ODS_THEME } from '@ovhcloud/ods-themes';
-import { OText } from './OText';
 import styles from './app.scss';
 
 const App = () => {
@@ -30,13 +29,6 @@ const App = () => {
         Headline with ODS mixin
       </h1>
 
-      <OdsText preset={ ODS_TEXT_PRESET.headline }
-               onFocusEvent={ (e) => console.log(e) }>
-        ODS Text Headline
-      </OdsText>
-
-      <OText preset={ ODS_TEXT_PRESET.headline } />
-
       <OdsSpinner size={ ODS_SPINNER_SIZE.sm } />
       <OdsSpinner />
       <OdsSpinner size="lg" />

diff --git a/packages/examples/react-webpack/src/app/OText.tsx b/packages/examples/react-webpack/src/app/OText.tsx
diff --git a/packages/examples/react-webpack/src/app/app.scss b/packages/examples/react-webpack/src/app/app.scss
@@ -1,8 +1,10 @@
+//@use '@ovhcloud/ods-components/style' as ods;
 @import '@ovhcloud/ods-components/style';
 
 .app {
   &__title {
-    @extend %ods-headline;
+    //@include ods.ods-headline();
+    @include ods-headline();
   }
 
   &__spinner {

diff --git a/packages/ods/src/style/index.scss b/packages/ods/src/style/index.scss
@@ -1 +1 @@
-@use 'text';
+@forward 'text';
diff --git a/packages/ods/style/package.json b/packages/ods/style/package.json
@@ -8,7 +8,7 @@
   "license": "Apache-2.0",
   "main": "./dist/index.scss",
   "scripts": {
-    "build": "shx cp -r ../src/style ./dist",
+    "build": "npm run clean && shx cp -r ../src/style ./dist",
     "clean": "rimraf dist"
   },
   "devDependencies": {