Fix label cursor if not editing element

app/lib/handlers/eraser.dart

@@ -100,5 +100,5 @@ class EraserHandler extends Handler<EraserTool> {
 
 // Returns the mouse cursor to be used when the user interacts with the eraser tool.
   @override
-  MouseCursor get cursor => SystemMouseCursors.precise;
+  MouseCursor get cursor => SystemMouseCursors.none;
 }

app/lib/handlers/label.dart

@@ -770,5 +770,5 @@ class LabelHandler extends Handler<LabelTool>
   }
 
   @override
-  MouseCursor get cursor => SystemMouseCursors.text;
+  MouseCursor get cursor => SystemMouseCursors.none;
 }

app/lib/handlers/path_eraser.dart

@@ -73,4 +73,7 @@ class PathEraserHandler extends Handler<PathEraserTool> {
       context.getDocumentBloc().add(ElementsRemoved(_erased.toList()));
     }
   }
+
+  @override
+  MouseCursor? get cursor => SystemMouseCursors.none;
 }

app/lib/models/label.dart

@@ -36,8 +36,8 @@ sealed class LabelContext with _$LabelContext {
 
   LabelElement? get labelElement => element as LabelElement?;
 
-  PackAssetLocation get styleSheet =>
-      labelElement?.styleSheet ?? tool.styleSheet;
+  PackAssetLocation getStyleSheet(NoteData document) =>
+      labelElement?.styleSheet ?? tool.styleSheet.fixStyle(document);
 
   int get length =>
       switch (this) {
@@ -108,30 +108,32 @@ extension TextContextHelper on TextContext {
         const ParagraphProperty.undefined();
   }
 
-  DefinedParagraphProperty? getDefinedProperty(NoteData document) {
+  DefinedParagraphProperty getDefinedProperty(NoteData document) {
     final property = getProperty();
     if (property is DefinedParagraphProperty) {
       return property;
     }
-    return styleSheet
-        .resolveStyle(document)
-        ?.resolveParagraphProperty(property);
+    return getStyleSheet(document)
+            .resolveStyle(document)
+            ?.resolveParagraphProperty(property) ??
+        DefinedParagraphProperty();
   }
 
   SpanProperty? getSpanProperty(NoteData document) {
     final index = selection.start;
     return switch (paragraph?.getSpan(index)?.property) {
       DefinedSpanProperty e => e,
       NamedSpanProperty e => e,
-      _ => getDefinedProperty(document)?.span,
+      _ => getDefinedProperty(document).span,
     };
   }
 
   DefinedSpanProperty getDefinedSpanProperty(NoteData document) {
     return switch (getSpanProperty(document)) {
           DefinedSpanProperty e => e,
-          NamedSpanProperty e =>
-            styleSheet.resolveStyle(document)?.resolveSpanProperty(e),
+          NamedSpanProperty e => getStyleSheet(document)
+              .resolveStyle(document)
+              ?.resolveSpanProperty(e),
           _ => null,
         } ??
         const DefinedSpanProperty();
@@ -140,8 +142,9 @@ extension TextContextHelper on TextContext {
   DefinedParagraphProperty getDefinedForcedProperty(NoteData document) {
     return switch (forcedProperty) {
           DefinedParagraphProperty e => e,
-          NamedParagraphProperty e =>
-            styleSheet.resolveStyle(document)?.resolveParagraphProperty(e),
+          NamedParagraphProperty e => getStyleSheet(document)
+              .resolveStyle(document)
+              ?.resolveParagraphProperty(e),
           _ => null,
         } ??
         const DefinedParagraphProperty();
@@ -151,8 +154,9 @@ extension TextContextHelper on TextContext {
       [bool fallback = true]) {
     return switch (forcedSpanProperty) {
           DefinedSpanProperty e => e,
-          NamedSpanProperty e =>
-            styleSheet.resolveStyle(document)?.resolveSpanProperty(e),
+          NamedSpanProperty e => getStyleSheet(document)
+              .resolveStyle(document)
+              ?.resolveSpanProperty(e),
           _ => null,
         } ??
         (fallback

app/lib/renderers/cursors/label.dart

@@ -25,13 +25,13 @@ class LabelCursor extends Renderer<LabelCursorData> {
     const icon = PhosphorIconsLight.cursorText;
     final property = switch (element.context) {
       TextContext e => e.getDefinedProperty(document),
-      _ => null
+      _ => const text.DefinedParagraphProperty(),
     };
-    final iconSize =
-        (property ?? const text.DefinedParagraphProperty()).span.getSize() *
-            (element.context?.labelElement?.scale ??
-                (element.tool.zoomDependent ? 1 / transform.size : 1));
-    final iconColor = Color(property?.span.color ??
+    final iconSize = property.span.getSize() *
+        (element.context?.labelElement?.scale ??
+            (element.tool.scale *
+                (element.tool.zoomDependent ? 1 / transform.size : 1)));
+    final iconColor = Color(property.span.color ??
         colorScheme?.primary.value ??
         Colors.black.value);
     final iconPainter = TextPainter(

app/lib/views/toolbar/label.dart

@@ -99,7 +99,7 @@ class _LabelToolbarViewState extends State<LabelToolbarView> {
       TextContext e => e.getDefinedForcedSpanProperty(document),
       _ => null
     };
-    final styleSheet = value.styleSheet;
+    final styleSheet = value.getStyleSheet(document);
     final style = styleSheet.resolveStyle(document);
     _scaleController.text =
         (value.labelElement?.scale ?? value.tool.scale).toString();

metadata/en-US/changelogs/121.txt

@@ -4,6 +4,8 @@
 * Improve performance on large pages ([#667](https://github.com/LinwoodDev/Butterfly/issues/667) partially)
 * Improve property view
 * Fix changing page don't showing content ([#755](https://github.com/LinwoodDev/Butterfly/issues/755))
+* Fix label cursor if not editing element
+* Remove cusor visibility on eraser, path eraser and label tool
 * Remove label tool can be changed tool to allow context menu
 
 Read more here: https://linwood.dev/butterfly/2.2.2-rc.1