fix: text color

CyanSalt · Jul 17, 2023 · 9c07561 · 9c07561
1 parent 288f1ad
commit 9c07561
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/docs/components/icon.md b/docs/components/icon.md
@@ -138,7 +138,7 @@ See [Text](/components/text).
   </template>
   <template #body:color:default>
 
-  `var(--r-common-text-color)` for `default` `type`, other theme colors for other `type`
+  `var(--r-text-color)`
 
   </template>
   <template #body:color:description>

diff --git a/docs/components/text.md b/docs/components/text.md
@@ -158,7 +158,9 @@ import { RSpace, RText } from 'roughness'
   </template>
   <template #body:color:default>
 
-  `var(--r-common-text-color)` for `default` `type`, other theme colors for other `type`
+  `var(--r-common-text-color)` for `default` `type`, other theme colors for other `type`.
+
+  When `type` is `default`, it will also be inherited from ancestors.
 
   </template>
   <template #body:color:description>

diff --git a/src/icon/index.vue b/src/icon/index.vue
@@ -134,7 +134,7 @@ function draw(rc: RoughSVG, svg: SVGSVGElement) {
 
 <style lang="scss" scoped>
 .r-icon {
-  --r-icon-color: var(--r-common-text-color);
+  --r-icon-color: var(--r-text-color);
   display: inline-block;
   width: calc(1em + 4px);
   height: calc(1em + 4px);

diff --git a/src/text/index.vue b/src/text/index.vue
@@ -29,6 +29,9 @@ defineSlots<{
 .r-text {
   --r-text-color: var(--r-common-text-color);
   color: var(--r-text-color);
+  :where(.r-text) {
+    --r-text-color: inherit;
+  }
   &.primary {
     --r-text-color: var(--r-common-primary-color);
   }