From dfb8507d32233dcd2dbd3b8504abf35844c627a6 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <aonnikov@hardcoreeng.com>
Date: Thu, 7 Nov 2024 14:02:46 +0700
Subject: [PATCH] UBERF-8575 Exclude markups from inline attrs bar (#7117)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 .../src/components/InlineAttributeBar.svelte       | 13 +++++++++----
 packages/presentation/src/utils.ts                 | 14 ++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/packages/presentation/src/components/InlineAttributeBar.svelte b/packages/presentation/src/components/InlineAttributeBar.svelte
index 2989c48d79..83a09debff 100644
--- a/packages/presentation/src/components/InlineAttributeBar.svelte
+++ b/packages/presentation/src/components/InlineAttributeBar.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-  import { Class, Data, Doc, Ref } from '@hcengineering/core'
+  import { Class, Data, Doc, Hierarchy, Ref } from '@hcengineering/core'
   import { InlineAttributeBarEditor } from '..'
   import { KeyedAttribute } from '../attributes'
-  import { getClient, getFiltredKeys, isCollectionAttr } from '../utils'
+  import { getClient, getFiltredKeys, isCollectionAttr, isCollabAttr, isMarkupAttr } from '../utils'
 
   export let object: Doc | Data<Doc>
   export let _class: Ref<Class<Doc>>
@@ -15,10 +15,15 @@
 
   const client = getClient()
 
+  function isInlineAttr (hierarchy: Hierarchy, key: KeyedAttribute): boolean {
+    return !isCollectionAttr(hierarchy, key) && !isCollabAttr(hierarchy, key) && !isMarkupAttr(hierarchy, key)
+  }
+
   function updateKeys (_class: Ref<Class<Doc>>, ignoreKeys: string[], to: Ref<Class<Doc>> | undefined): void {
-    const filtredKeys = getFiltredKeys(client.getHierarchy(), _class, ignoreKeys, to)
+    const hierarchy = client.getHierarchy()
+    const filtredKeys = getFiltredKeys(hierarchy, _class, ignoreKeys, to)
     keys = filtredKeys.filter(
-      (key) => (extraKeys.includes(key.key) || !isCollectionAttr(client.getHierarchy(), key)) && !key.attr.readonly
+      (key) => (extraKeys.includes(key.key) || isInlineAttr(hierarchy, key)) && key.attr.readonly !== true
     )
   }
 
diff --git a/packages/presentation/src/utils.ts b/packages/presentation/src/utils.ts
index 2ee4072fd0..005e2e6883 100644
--- a/packages/presentation/src/utils.ts
+++ b/packages/presentation/src/utils.ts
@@ -654,6 +654,20 @@ export function isCollectionAttr (hierarchy: Hierarchy, key: KeyedAttribute): bo
   return hierarchy.isDerived(key.attr.type._class, core.class.Collection)
 }
 
+/**
+ * @public
+ */
+export function isMarkupAttr (hierarchy: Hierarchy, key: KeyedAttribute): boolean {
+  return hierarchy.isDerived(key.attr.type._class, core.class.TypeMarkup)
+}
+
+/**
+ * @public
+ */
+export function isCollabAttr (hierarchy: Hierarchy, key: KeyedAttribute): boolean {
+  return hierarchy.isDerived(key.attr.type._class, core.class.TypeCollaborativeDoc)
+}
+
 /**
  * @public
  */