From 9f9e0cd6574ab667ea01d3de1062502736c846da Mon Sep 17 00:00:00 2001
From: tshimber <tatiana.shimbereva@telekom.de>
Date: Tue, 27 Aug 2024 15:21:05 +0200
Subject: [PATCH 1/2] feat: tag cell in data-grid extended

---
 .../src/components/data-grid/cell-handlers/tags-cell.tsx    | 6 +++++-
 packages/components/src/html/data-grid.html                 | 6 +++++-
 .../stories/components/data-grid/DataGrid.stories.mdx       | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/components/src/components/data-grid/cell-handlers/tags-cell.tsx b/packages/components/src/components/data-grid/cell-handlers/tags-cell.tsx
index c1e4ef3cd8..50c46cf97a 100644
--- a/packages/components/src/components/data-grid/cell-handlers/tags-cell.tsx
+++ b/packages/components/src/components/data-grid/cell-handlers/tags-cell.tsx
@@ -33,7 +33,11 @@ export const TagsCell: Cell = {
       <ul class={`tbody__tag-list`}>
         {tags.map((tag) => (
           <li>
-            <scale-tag size="small" type="strong" color={tag.color}>
+            <scale-tag
+              size={tag.size || 'small'}
+              type={tag.type || 'strong'}
+              color={tag.color || 'standard'}
+            >
               {tag.content}
             </scale-tag>
           </li>
diff --git a/packages/components/src/html/data-grid.html b/packages/components/src/html/data-grid.html
index ca25564166..7181902c32 100644
--- a/packages/components/src/html/data-grid.html
+++ b/packages/components/src/html/data-grid.html
@@ -212,7 +212,11 @@
           'One',
           'Lorem ipsum dolor sit amet sime',
           'http://example.com',
-          'Simple, Short',
+          [
+            { content: 'Apple', color: 'red', size: 'standard' },
+            { content: 'Pear', color: 'green', type: 'strong' },
+            { content: 'Bug' },
+          ],
           '00:00:20',
           102045.0,
           false,
diff --git a/packages/storybook-vue/stories/components/data-grid/DataGrid.stories.mdx b/packages/storybook-vue/stories/components/data-grid/DataGrid.stories.mdx
index 4c38c09346..ec690e09da 100644
--- a/packages/storybook-vue/stories/components/data-grid/DataGrid.stories.mdx
+++ b/packages/storybook-vue/stories/components/data-grid/DataGrid.stories.mdx
@@ -42,7 +42,7 @@ import ScaleDataGrid from './ScaleDataGrid.vue';
       },
       description: `(optional) Title for sortable columns`,
       control: { type: null },
-    },    
+    },
     height: {
       table: {
         type: { summary: 'string' },
@@ -669,7 +669,7 @@ Expected format: string
 
 ## Tags Cell
 
-Expected format: comma delimited `string`, eg `'one, two, three'` or array of objects with content and color keys, e.g. `{content: 'Apple', color: 'red'}`
+Expected format: comma delimited `string`, eg `'one, two, three'` or array of objects with required content key and optional color, type, size keys, e.g. `{content: 'Apple', color: 'red'}`. Acceptable values for color, type, size are same as for Tag component.
 
 <Canvas withSource="close">
   <Story name="Tags Cell">

From 58edcf8cbc3b9aeda4b44eaa3a0b8ce3a68f87ce Mon Sep 17 00:00:00 2001
From: tshimber <tatiana.shimbereva@telekom.de>
Date: Mon, 14 Oct 2024 09:54:13 +0200
Subject: [PATCH 2/2] fix: link to tag added to docs

---
 .../stories/components/data-grid/DataGrid.stories.mdx           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/storybook-vue/stories/components/data-grid/DataGrid.stories.mdx b/packages/storybook-vue/stories/components/data-grid/DataGrid.stories.mdx
index ec690e09da..635bc12ce5 100644
--- a/packages/storybook-vue/stories/components/data-grid/DataGrid.stories.mdx
+++ b/packages/storybook-vue/stories/components/data-grid/DataGrid.stories.mdx
@@ -669,7 +669,7 @@ Expected format: string
 
 ## Tags Cell
 
-Expected format: comma delimited `string`, eg `'one, two, three'` or array of objects with required content key and optional color, type, size keys, e.g. `{content: 'Apple', color: 'red'}`. Acceptable values for color, type, size are same as for Tag component.
+Expected format: comma delimited `string`, eg `'one, two, three'` or array of objects with required content key and optional color, type, size keys, e.g. `{content: 'Apple', color: 'red'}`. Acceptable values for color, type, size are same as for [Tag component](?path=/docs/components-tag--standard).
 
 <Canvas withSource="close">
   <Story name="Tags Cell">