@nasser-sw/fabric 7.0.0-beta1 → 7.0.1-beta2

package/dist/src/shapes/Text/Text.mjs

@@ -20,9 +20,9 @@ import { cacheProperties } from '../Object/defaultValues.mjs';
 
 let measuringContext;
 
-/**
- * Return a context for measurement of text string.
- * if created it gets stored for reuse
+/**
+ * Return a context for measurement of text string.
+ * if created it gets stored for reuse
  */
 function getMeasuringContext() {
   if (!measuringContext) {
@@ -35,17 +35,17 @@ function getMeasuringContext() {
   return measuringContext;
 }
 
-/**
- * Measure and return the info of a single grapheme.
- * needs the the info of previous graphemes already filled
- * Override to customize measuring
+/**
+ * Measure and return the info of a single grapheme.
+ * needs the the info of previous graphemes already filled
+ * Override to customize measuring
  */
 
 // @TODO this is not complete
 
-/**
- * Text class
- * @see {@link http://fabricjs.com/fabric-intro-part-2#text}
+/**
+ * Text class
+ * @see {@link http://fabricjs.com/fabric-intro-part-2#text}
  */
 class FabricText extends StyledText {
   static getDefaults() {
@@ -56,11 +56,11 @@ class FabricText extends StyledText {
   }
   constructor(text, options) {
     super();
-    /**
-     * contains characters bounding boxes
-     * This variable is considered to be protected.
-     * But for how mixins are implemented right now, we can't leave it private
-     * @protected
+    /**
+     * contains characters bounding boxes
+     * This variable is considered to be protected.
+     * But for how mixins are implemented right now, we can't leave it private
+     * @protected
      */
     _defineProperty(this, "__charBounds", []);
     Object.assign(this, FabricText.ownDefaults);
@@ -77,9 +77,9 @@ class FabricText extends StyledText {
     this.setCoords();
   }
 
-  /**
-   * If text has a path, it will add the extra information needed
-   * for path and text calculations
+  /**
+   * If text has a path, it will add the extra information needed
+   * for path and text calculations
    */
   setPathInfo() {
     const path = this.path;
@@ -88,10 +88,10 @@ class FabricText extends StyledText {
     }
   }
 
-  /**
-   * @private
-   * Divides text into lines of text and lines of graphemes.
-   * Uses browser lines when available for pixel-perfect consistency.
+  /**
+   * @private
+   * Divides text into lines of text and lines of graphemes.
+   * Uses browser lines when available for pixel-perfect consistency.
    */
   _splitText() {
     // Check if we have valid browser lines and should use them
@@ -107,9 +107,9 @@ class FabricText extends StyledText {
     return newLines;
   }
 
-  /**
-   * Create TextLinesInfo from browser-extracted lines
-   * @private
+  /**
+   * Create TextLinesInfo from browser-extracted lines
+   * @private
    */
   _splitTextFromBrowserLines(browserLines) {
     const lines = [];
@@ -143,10 +143,10 @@ class FabricText extends StyledText {
     return result;
   }
 
-  /**
-   * Initialize or update text dimensions.
-   * Updates this.width and this.height with the proper values.
-   * Does not return dimensions.
+  /**
+   * Initialize or update text dimensions.
+   * Updates this.width and this.height with the proper values.
+   * Does not return dimensions.
    */
   initDimensions() {
     // Use advanced layout if enabled
@@ -169,11 +169,12 @@ class FabricText extends StyledText {
     }
   }
 
-  /**
-   * Enlarge space boxes and shift the others
+  /**
+   * Enlarge space boxes and shift the others
    */
   enlargeSpaces() {
     let diffSpace, currentLineWidth, numberOfSpaces, accumulatedSpace, line, charBound, spaces;
+    const isRtl = this.direction === 'rtl';
     for (let i = 0, len = this._textLines.length; i < len; i++) {
       if (this.textAlign !== JUSTIFY && (i === len - 1 || this.isEndOfWrapping(i))) {
         continue;
@@ -184,33 +185,62 @@ class FabricText extends StyledText {
       if (currentLineWidth < this.width && (spaces = this.textLines[i].match(this._reSpacesAndTabs))) {
         numberOfSpaces = spaces.length;
         diffSpace = (this.width - currentLineWidth) / numberOfSpaces;
-        for (let j = 0; j <= line.length; j++) {
-          charBound = this.__charBounds[i][j];
-          if (this._reSpaceAndTab.test(line[j])) {
-            charBound.width += diffSpace;
-            charBound.kernedWidth += diffSpace;
-            charBound.left += accumulatedSpace;
-            accumulatedSpace += diffSpace;
-          } else {
-            charBound.left += accumulatedSpace;
+        if (isRtl) {
+          for (let j = 0; j < line.length; j++) {
+            if (this._reSpaceAndTab.test(line[j])) ;
+          }
+
+          // For RTL, we need to work backwards through the visual positions
+          // but still update logical positions correctly
+          let spaceCount = 0;
+          for (let j = 0; j <= line.length; j++) {
+            charBound = this.__charBounds[i][j];
+            if (charBound) {
+              if (this._reSpaceAndTab.test(line[j])) {
+                charBound.width += diffSpace;
+                charBound.kernedWidth += diffSpace;
+                spaceCount++;
+              }
+
+              // For RTL, shift all characters to the right by the total expansion
+              // minus the expansion that comes after this character
+              const remainingSpaces = numberOfSpaces - spaceCount;
+              const shiftAmount = remainingSpaces * diffSpace;
+              charBound.left += shiftAmount;
+            }
+          }
+        } else {
+          // LTR processing (original logic)
+          for (let j = 0; j <= line.length; j++) {
+            charBound = this.__charBounds[i][j];
+            if (charBound) {
+              if (this._reSpaceAndTab.test(line[j])) {
+                charBound.width += diffSpace;
+                charBound.kernedWidth += diffSpace;
+                charBound.left += accumulatedSpace;
+                accumulatedSpace += diffSpace;
+              } else {
+                charBound.left += accumulatedSpace;
+              }
+            }
           }
         }
       }
     }
   }
 
-  /**
-   * Advanced layout using new text engine (Konva-compatible)
-   * @private
+  /**
+   * Advanced layout using new text engine (Konva-compatible)
+   * @private
    */
   _layoutTextAdvanced() {
     const options = this._getAdvancedLayoutOptions();
     return layoutText(options);
   }
 
-  /**
-   * Get advanced layout options from current text properties
-   * @private
+  /**
+   * Get advanced layout options from current text properties
+   * @private
    */
   _getAdvancedLayoutOptions() {
     return {
@@ -232,9 +262,9 @@ class FabricText extends StyledText {
     };
   }
 
-  /**
-   * Map Fabric textAlign to Konva align format
-   * @private
+  /**
+   * Map Fabric textAlign to Konva align format
+   * @private
    */
   _mapTextAlignToAlign(textAlign) {
     switch (textAlign) {
@@ -255,8 +285,8 @@ class FabricText extends StyledText {
     }
   }
 
-  /**
-   * Enhanced initDimensions that uses advanced layout when enabled
+  /**
+   * Enhanced initDimensions that uses advanced layout when enabled
    */
   initDimensionsAdvanced() {
     if (!this.enableAdvancedLayout) {
@@ -273,9 +303,9 @@ class FabricText extends StyledText {
     this.dirty = true;
   }
 
-  /**
-   * Convert new layout format to legacy _textLines and __charBounds format
-   * @private
+  /**
+   * Convert new layout format to legacy _textLines and __charBounds format
+   * @private
    */
   _convertLayoutToLegacyFormat(layout) {
     this._textLines = layout.lines.map(line => line.graphemes);
@@ -297,30 +327,30 @@ class FabricText extends StyledText {
     }
   }
 
-  /**
-   * Detect if the text line is ended with an hard break
-   * text and itext do not have wrapping, return false
-   * @return {Boolean}
+  /**
+   * Detect if the text line is ended with an hard break
+   * text and itext do not have wrapping, return false
+   * @return {Boolean}
    */
   isEndOfWrapping(lineIndex) {
     return lineIndex === this._textLines.length - 1;
   }
 
-  /**
-   * Detect if a line has a linebreak and so we need to account for it when moving
-   * and counting style.
-   * It return always 1 for text and Itext. Textbox has its own implementation
-   * @return Number
+  /**
+   * Detect if a line has a linebreak and so we need to account for it when moving
+   * and counting style.
+   * It return always 1 for text and Itext. Textbox has its own implementation
+   * @return Number
    */
 
   missingNewlineOffset(_lineIndex) {
     return 1;
   }
 
-  /**
-   * Returns 2d representation (lineIndex and charIndex) of cursor
-   * @param {Number} selectionStart
-   * @param {Boolean} [skipWrapping] consider the location for unwrapped lines. useful to manage styles.
+  /**
+   * Returns 2d representation (lineIndex and charIndex) of cursor
+   * @param {Number} selectionStart
+   * @param {Boolean} [skipWrapping] consider the location for unwrapped lines. useful to manage styles.
    */
   get2DCursorLocation(selectionStart, skipWrapping) {
     const lines = skipWrapping ? this._unwrappedTextLines : this._textLines;
@@ -340,24 +370,24 @@ class FabricText extends StyledText {
     };
   }
 
-  /**
-   * Returns string representation of an instance
-   * @return {String} String representation of text object
+  /**
+   * Returns string representation of an instance
+   * @return {String} String representation of text object
    */
   toString() {
     return `#<Text (${this.complexity()}): { "text": "${this.text}", "fontFamily": "${this.fontFamily}" }>`;
   }
 
-  /**
-   * Return the dimension and the zoom level needed to create a cache canvas
-   * big enough to host the object to be cached.
-   * @private
-   * @param {Object} dim.x width of object to be cached
-   * @param {Object} dim.y height of object to be cached
-   * @return {Object}.width width of canvas
-   * @return {Object}.height height of canvas
-   * @return {Object}.zoomX zoomX zoom value to unscale the canvas before drawing cache
-   * @return {Object}.zoomY zoomY zoom value to unscale the canvas before drawing cache
+  /**
+   * Return the dimension and the zoom level needed to create a cache canvas
+   * big enough to host the object to be cached.
+   * @private
+   * @param {Object} dim.x width of object to be cached
+   * @param {Object} dim.y height of object to be cached
+   * @return {Object}.width width of canvas
+   * @return {Object}.height height of canvas
+   * @return {Object}.zoomX zoomX zoom value to unscale the canvas before drawing cache
+   * @return {Object}.zoomY zoomY zoom value to unscale the canvas before drawing cache
    */
   _getCacheCanvasDimensions() {
     const dims = super._getCacheCanvasDimensions();
@@ -367,9 +397,9 @@ class FabricText extends StyledText {
     return dims;
   }
 
-  /**
-   * @private
-   * @param {CanvasRenderingContext2D} ctx Context to render on
+  /**
+   * @private
+   * @param {CanvasRenderingContext2D} ctx Context to render on
    */
   _render(ctx) {
     const path = this.path;
@@ -382,9 +412,9 @@ class FabricText extends StyledText {
     this._renderTextDecoration(ctx, 'linethrough');
   }
 
-  /**
-   * @private
-   * @param {CanvasRenderingContext2D} ctx Context to render on
+  /**
+   * @private
+   * @param {CanvasRenderingContext2D} ctx Context to render on
    */
   _renderText(ctx) {
     // Skip text rendering if in overlay editing mode
@@ -400,15 +430,15 @@ class FabricText extends StyledText {
     }
   }
 
-  /**
-   * Set the font parameter of the context with the object properties or with charStyle
-   * @private
-   * @param {CanvasRenderingContext2D} ctx Context to render on
-   * @param {Object} [charStyle] object with font style properties
-   * @param {String} [charStyle.fontFamily] Font Family
-   * @param {Number} [charStyle.fontSize] Font size in pixels. ( without px suffix )
-   * @param {String} [charStyle.fontWeight] Font weight
-   * @param {String} [charStyle.fontStyle] Font style (italic|normal)
+  /**
+   * Set the font parameter of the context with the object properties or with charStyle
+   * @private
+   * @param {CanvasRenderingContext2D} ctx Context to render on
+   * @param {Object} [charStyle] object with font style properties
+   * @param {String} [charStyle.fontFamily] Font Family
+   * @param {Number} [charStyle.fontSize] Font size in pixels. ( without px suffix )
+   * @param {String} [charStyle.fontWeight] Font weight
+   * @param {String} [charStyle.fontStyle] Font style (italic|normal)
    */
   _setTextStyles(ctx, charStyle, forMeasuring) {
     ctx.textBaseline = 'alphabetic';
@@ -428,11 +458,11 @@ class FabricText extends StyledText {
     ctx.font = this._getFontDeclaration(charStyle, forMeasuring);
   }
 
-  /**
-   * calculate and return the text Width measuring each line.
-   * @private
-   * @param {CanvasRenderingContext2D} ctx Context to render on
-   * @return {Number} Maximum width of Text object
+  /**
+   * calculate and return the text Width measuring each line.
+   * @private
+   * @param {CanvasRenderingContext2D} ctx Context to render on
+   * @return {Number} Maximum width of Text object
    */
   calcTextWidth() {
     let maxWidth = this.getLineWidth(0);
@@ -445,23 +475,23 @@ class FabricText extends StyledText {
     return maxWidth;
   }
 
-  /**
-   * @private
-   * @param {String} method Method name ("fillText" or "strokeText")
-   * @param {CanvasRenderingContext2D} ctx Context to render on
-   * @param {String} line Text to render
-   * @param {Number} left Left position of text
-   * @param {Number} top Top position of text
-   * @param {Number} lineIndex Index of a line in a text
+  /**
+   * @private
+   * @param {String} method Method name ("fillText" or "strokeText")
+   * @param {CanvasRenderingContext2D} ctx Context to render on
+   * @param {String} line Text to render
+   * @param {Number} left Left position of text
+   * @param {Number} top Top position of text
+   * @param {Number} lineIndex Index of a line in a text
    */
   _renderTextLine(method, ctx, line, left, top, lineIndex) {
     this._renderChars(method, ctx, line, left, top, lineIndex);
   }
 
-  /**
-   * Renders the text background for lines, taking care of style
-   * @private
-   * @param {CanvasRenderingContext2D} ctx Context to render on
+  /**
+   * Renders the text background for lines, taking care of style
+   * @private
+   * @param {CanvasRenderingContext2D} ctx Context to render on
    */
   _renderTextLinesBackground(ctx) {
     if (!this.textBackgroundColor && !this.styleHas('textBackgroundColor')) {
@@ -524,15 +554,15 @@ class FabricText extends StyledText {
     this._removeShadow(ctx);
   }
 
-  /**
-   * measure and return the width of a single character.
-   * possibly overridden to accommodate different measure logic or
-   * to hook some external lib for character measurement
-   * @private
-   * @param {String} _char, char to be measured
-   * @param {Object} charStyle style of char to be measured
-   * @param {String} [previousChar] previous char
-   * @param {Object} [prevCharStyle] style of previous char
+  /**
+   * measure and return the width of a single character.
+   * possibly overridden to accommodate different measure logic or
+   * to hook some external lib for character measurement
+   * @private
+   * @param {String} _char, char to be measured
+   * @param {Object} charStyle style of char to be measured
+   * @param {String} [previousChar] previous char
+   * @param {Object} [prevCharStyle] style of previous char
    */
   _measureChar(_char, charStyle, previousChar, prevCharStyle) {
     const fontCache = cache.getFontCache(charStyle),
@@ -577,19 +607,19 @@ class FabricText extends StyledText {
     };
   }
 
-  /**
-   * Computes height of character at given position
-   * @param {Number} line the line index number
-   * @param {Number} _char the character index number
-   * @return {Number} fontSize of the character
+  /**
+   * Computes height of character at given position
+   * @param {Number} line the line index number
+   * @param {Number} _char the character index number
+   * @return {Number} fontSize of the character
    */
   getHeightOfChar(line, _char) {
     return this.getValueOfPropertyAt(line, _char, 'fontSize');
   }
 
-  /**
-   * measure a text line measuring all characters.
-   * @param {Number} lineIndex line number
+  /**
+   * measure a text line measuring all characters.
+   * @param {Number} lineIndex line number
    */
   measureLine(lineIndex) {
     const lineInfo = this._measureLine(lineIndex);
@@ -602,11 +632,11 @@ class FabricText extends StyledText {
     return lineInfo;
   }
 
-  /**
-   * measure every grapheme of a line, populating __charBounds
-   * @param {Number} lineIndex
-   * @return {Object} object.width total width of characters
-   * @return {Object} object.numOfSpaces length of chars that match this._reSpacesAndTabs
+  /**
+   * measure every grapheme of a line, populating __charBounds
+   * @param {Number} lineIndex
+   * @return {Object} object.width total width of characters
+   * @return {Object} object.numOfSpaces length of chars that match this._reSpacesAndTabs
    */
   _measureLine(lineIndex) {
     let width = 0,
@@ -669,13 +699,13 @@ class FabricText extends StyledText {
     };
   }
 
-  /**
-   * Calculate the angle  and the left,top position of the char that follow a path.
-   * It appends it to graphemeInfo to be reused later at rendering
-   * @private
-   * @param {Number} positionInPath to be measured
-   * @param {GraphemeBBox} graphemeInfo current grapheme box information
-   * @param {Object} startingPoint position of the point
+  /**
+   * Calculate the angle  and the left,top position of the char that follow a path.
+   * It appends it to graphemeInfo to be reused later at rendering
+   * @private
+   * @param {Number} positionInPath to be measured
+   * @param {GraphemeBBox} graphemeInfo current grapheme box information
+   * @param {Object} startingPoint position of the point
    */
   _setGraphemeOnPath(positionInPath, graphemeInfo) {
     const centerPosition = positionInPath + graphemeInfo.kernedWidth / 2,
@@ -688,13 +718,13 @@ class FabricText extends StyledText {
     graphemeInfo.angle = info.angle + (this.pathSide === RIGHT ? Math.PI : 0);
   }
 
-  /**
-   *
-   * @param {String} grapheme to be measured
-   * @param {Number} lineIndex index of the line where the char is
-   * @param {Number} charIndex position in the line
-   * @param {String} [prevGrapheme] character preceding the one to be measured
-   * @returns {GraphemeBBox} grapheme bbox
+  /**
+   *
+   * @param {String} grapheme to be measured
+   * @param {Number} lineIndex index of the line where the char is
+   * @param {Number} charIndex position in the line
+   * @param {String} [prevGrapheme] character preceding the one to be measured
+   * @returns {GraphemeBBox} grapheme bbox
    */
   _getGraphemeBox(grapheme, lineIndex, charIndex, prevGrapheme, skipLeft) {
     const style = this.getCompleteStyleDeclaration(lineIndex, charIndex),
@@ -722,10 +752,10 @@ class FabricText extends StyledText {
     return box;
   }
 
-  /**
-   * Calculate height of line at 'lineIndex'
-   * @param {Number} lineIndex index of line to calculate
-   * @return {Number}
+  /**
+   * Calculate height of line at 'lineIndex'
+   * @param {Number} lineIndex index of line to calculate
+   * @return {Number}
    */
   getHeightOfLine(lineIndex) {
     if (this.__lineHeights[lineIndex]) {
@@ -741,8 +771,8 @@ class FabricText extends StyledText {
     return this.__lineHeights[lineIndex] = maxHeight * this.lineHeight * this._fontSizeMult;
   }
 
-  /**
-   * Calculate text box height
+  /**
+   * Calculate text box height
    */
   calcTextHeight() {
     let lineHeight,
@@ -754,26 +784,26 @@ class FabricText extends StyledText {
     return height;
   }
 
-  /**
-   * @private
-   * @return {Number} Left offset
+  /**
+   * @private
+   * @return {Number} Left offset
    */
   _getLeftOffset() {
     return this.direction === 'ltr' ? -this.width / 2 : this.width / 2;
   }
 
-  /**
-   * @private
-   * @return {Number} Top offset
+  /**
+   * @private
+   * @return {Number} Top offset
    */
   _getTopOffset() {
     return -this.height / 2;
   }
 
-  /**
-   * @private
-   * @param {CanvasRenderingContext2D} ctx Context to render on
-   * @param {String} method Method name ("fillText" or "strokeText")
+  /**
+   * @private
+   * @param {CanvasRenderingContext2D} ctx Context to render on
+   * @param {String} method Method name ("fillText" or "strokeText")
    */
   _renderTextCommon(ctx, method) {
     ctx.save();
@@ -790,9 +820,9 @@ class FabricText extends StyledText {
     ctx.restore();
   }
 
-  /**
-   * @private
-   * @param {CanvasRenderingContext2D} ctx Context to render on
+  /**
+   * @private
+   * @param {CanvasRenderingContext2D} ctx Context to render on
    */
   _renderTextFill(ctx) {
     if (!this.fill && !this.styleHas(FILL)) {
@@ -801,9 +831,9 @@ class FabricText extends StyledText {
     this._renderTextCommon(ctx, 'fillText');
   }
 
-  /**
-   * @private
-   * @param {CanvasRenderingContext2D} ctx Context to render on
+  /**
+   * @private
+   * @param {CanvasRenderingContext2D} ctx Context to render on
    */
   _renderTextStroke(ctx) {
     if ((!this.stroke || this.strokeWidth === 0) && this.isEmptyStyles()) {
@@ -820,14 +850,14 @@ class FabricText extends StyledText {
     ctx.restore();
   }
 
-  /**
-   * @private
-   * @param {String} method fillText or strokeText.
-   * @param {CanvasRenderingContext2D} ctx Context to render on
-   * @param {Array} line Content of the line, splitted in an array by grapheme
-   * @param {Number} left
-   * @param {Number} top
-   * @param {Number} lineIndex
+  /**
+   * @private
+   * @param {String} method fillText or strokeText.
+   * @param {CanvasRenderingContext2D} ctx Context to render on
+   * @param {Array} line Content of the line, splitted in an array by grapheme
+   * @param {Number} left
+   * @param {Number} top
+   * @param {Number} lineIndex
    */
   _renderChars(method, ctx, line, left, top, lineIndex) {
     const lineHeight = this.getHeightOfLine(lineIndex),
@@ -850,7 +880,15 @@ class FabricText extends StyledText {
     if (currentDirection !== this.direction) {
       ctx.canvas.setAttribute('dir', isLtr ? 'ltr' : 'rtl');
       ctx.direction = isLtr ? 'ltr' : 'rtl';
-      ctx.textAlign = isLtr ? LEFT : RIGHT;
+
+      // For justify alignments, we need to set the correct canvas text alignment
+      // This is crucial for RTL text to render in the correct order
+      if (isJustify) {
+        // Justify uses LEFT alignment as a base, letting the character positioning handle justification
+        ctx.textAlign = LEFT;
+      } else {
+        ctx.textAlign = isLtr ? LEFT : RIGHT;
+      }
     }
     top -= lineHeight * this._fontSizeFraction / this.lineHeight;
     if (shortCut) {
@@ -901,16 +939,16 @@ class FabricText extends StyledText {
     ctx.restore();
   }
 
-  /**
-   * This function try to patch the missing gradientTransform on canvas gradients.
-   * transforming a context to transform the gradient, is going to transform the stroke too.
-   * we want to transform the gradient but not the stroke operation, so we create
-   * a transformed gradient on a pattern and then we use the pattern instead of the gradient.
-   * this method has drawbacks: is slow, is in low resolution, needs a patch for when the size
-   * is limited.
-   * @private
-   * @param {TFiller} filler a fabric gradient instance
-   * @return {CanvasPattern} a pattern to use as fill/stroke style
+  /**
+   * This function try to patch the missing gradientTransform on canvas gradients.
+   * transforming a context to transform the gradient, is going to transform the stroke too.
+   * we want to transform the gradient but not the stroke operation, so we create
+   * a transformed gradient on a pattern and then we use the pattern instead of the gradient.
+   * this method has drawbacks: is slow, is in low resolution, needs a patch for when the size
+   * is limited.
+   * @private
+   * @param {TFiller} filler a fabric gradient instance
+   * @return {CanvasPattern} a pattern to use as fill/stroke style
    */
   _applyPatternGradientTransformText(filler) {
     // TODO: verify compatibility with strokeUniform
@@ -966,12 +1004,12 @@ class FabricText extends StyledText {
     };
   }
 
-  /**
-   * This function prepare the canvas for a stroke style, and stroke and strokeWidth
-   * need to be sent in as defined
-   * @param {CanvasRenderingContext2D} ctx
-   * @param {CompleteTextStyleDeclaration} style with stroke and strokeWidth defined
-   * @returns
+  /**
+   * This function prepare the canvas for a stroke style, and stroke and strokeWidth
+   * need to be sent in as defined
+   * @param {CanvasRenderingContext2D} ctx
+   * @param {CompleteTextStyleDeclaration} style with stroke and strokeWidth defined
+   * @returns
    */
   _setStrokeStyles(ctx, _ref) {
     let {
@@ -986,12 +1024,12 @@ class FabricText extends StyledText {
     return this.handleFiller(ctx, 'strokeStyle', stroke);
   }
 
-  /**
-   * This function prepare the canvas for a ill style, and fill
-   * need to be sent in as defined
-   * @param {CanvasRenderingContext2D} ctx
-   * @param {CompleteTextStyleDeclaration} style with ill defined
-   * @returns
+  /**
+   * This function prepare the canvas for a ill style, and fill
+   * need to be sent in as defined
+   * @param {CanvasRenderingContext2D} ctx
+   * @param {CompleteTextStyleDeclaration} style with ill defined
+   * @returns
    */
   _setFillStyles(ctx, _ref2) {
     let {
@@ -1000,16 +1038,16 @@ class FabricText extends StyledText {
     return this.handleFiller(ctx, 'fillStyle', fill);
   }
 
-  /**
-   * @private
-   * @param {String} method
-   * @param {CanvasRenderingContext2D} ctx Context to render on
-   * @param {Number} lineIndex
-   * @param {Number} charIndex
-   * @param {String} _char
-   * @param {Number} left Left coordinate
-   * @param {Number} top Top coordinate
-   * @param {Number} lineHeight Height of the line
+  /**
+   * @private
+   * @param {String} method
+   * @param {CanvasRenderingContext2D} ctx Context to render on
+   * @param {Number} lineIndex
+   * @param {Number} charIndex
+   * @param {String} _char
+   * @param {Number} left Left coordinate
+   * @param {Number} top Top coordinate
+   * @param {Number} lineHeight Height of the line
    */
   _renderChar(method, ctx, lineIndex, charIndex, _char, left, top) {
     const decl = this._getStyleDeclaration(lineIndex, charIndex),
@@ -1038,30 +1076,30 @@ class FabricText extends StyledText {
     ctx.restore();
   }
 
-  /**
-   * Turns the character into a 'superior figure' (i.e. 'superscript')
-   * @param {Number} start selection start
-   * @param {Number} end selection end
+  /**
+   * Turns the character into a 'superior figure' (i.e. 'superscript')
+   * @param {Number} start selection start
+   * @param {Number} end selection end
    */
   setSuperscript(start, end) {
     this._setScript(start, end, this.superscript);
   }
 
-  /**
-   * Turns the character into an 'inferior figure' (i.e. 'subscript')
-   * @param {Number} start selection start
-   * @param {Number} end selection end
+  /**
+   * Turns the character into an 'inferior figure' (i.e. 'subscript')
+   * @param {Number} start selection start
+   * @param {Number} end selection end
    */
   setSubscript(start, end) {
     this._setScript(start, end, this.subscript);
   }
 
-  /**
-   * Applies 'schema' at given position
-   * @private
-   * @param {Number} start selection start
-   * @param {Number} end selection end
-   * @param {Number} schema
+  /**
+   * Applies 'schema' at given position
+   * @private
+   * @param {Number} start selection start
+   * @param {Number} end selection end
+   * @param {Number} schema
    */
   _setScript(start, end, schema) {
     const loc = this.get2DCursorLocation(start, true),
@@ -1074,10 +1112,10 @@ class FabricText extends StyledText {
     this.setSelectionStyles(style, start, end);
   }
 
-  /**
-   * @private
-   * @param {Number} lineIndex index text line
-   * @return {Number} Line left offset
+  /**
+   * @private
+   * @param {Number} lineIndex index text line
+   * @return {Number} Line left offset
    */
   _getLineLeftOffset(lineIndex) {
     const lineWidth = this.getLineWidth(lineIndex),
@@ -1086,9 +1124,21 @@ class FabricText extends StyledText {
       direction = this.direction,
       isEndOfWrapping = this.isEndOfWrapping(lineIndex);
     let leftOffset = 0;
-    if (textAlign === JUSTIFY || textAlign === JUSTIFY_CENTER && !isEndOfWrapping || textAlign === JUSTIFY_RIGHT && !isEndOfWrapping || textAlign === JUSTIFY_LEFT && !isEndOfWrapping) {
-      return 0;
+
+    // Handle justify alignments (excluding last lines and wrapped line ends)
+    const isJustifyLine = textAlign === JUSTIFY || textAlign === JUSTIFY_CENTER && !isEndOfWrapping || textAlign === JUSTIFY_RIGHT && !isEndOfWrapping || textAlign === JUSTIFY_LEFT && !isEndOfWrapping;
+    if (isJustifyLine) {
+      // Justify lines should start at the left edge for LTR and right edge for RTL
+      // The space distribution is handled by enlargeSpaces()
+      if (direction === 'rtl') {
+        // For RTL justify, we need to account for the line being right-aligned
+        return 0;
+      } else {
+        return 0;
+      }
     }
+
+    // Handle non-justify alignments
     if (textAlign === CENTER) {
       leftOffset = lineDiff / 2;
     }
@@ -1101,6 +1151,8 @@ class FabricText extends StyledText {
     if (textAlign === JUSTIFY_RIGHT) {
       leftOffset = lineDiff;
     }
+
+    // Apply RTL adjustments for non-justify alignments
     if (direction === 'rtl') {
       if (textAlign === RIGHT || textAlign === JUSTIFY || textAlign === JUSTIFY_RIGHT) {
         leftOffset = 0;
@@ -1113,8 +1165,8 @@ class FabricText extends StyledText {
     return leftOffset;
   }
 
-  /**
-   * @private
+  /**
+   * @private
    */
   _clearCache() {
     this._forceClearCache = false;
@@ -1123,12 +1175,12 @@ class FabricText extends StyledText {
     this.__charBounds = [];
   }
 
-  /**
-   * Measure a single line given its index. Used to calculate the initial
-   * text bounding box. The values are calculated and stored in __lineWidths cache.
-   * @private
-   * @param {Number} lineIndex line number
-   * @return {Number} Line width
+  /**
+   * Measure a single line given its index. Used to calculate the initial
+   * text bounding box. The values are calculated and stored in __lineWidths cache.
+   * @private
+   * @param {Number} lineIndex line number
+   * @return {Number} Line width
    */
   getLineWidth(lineIndex) {
     if (this.__lineWidths[lineIndex] !== undefined) {
@@ -1147,12 +1199,12 @@ class FabricText extends StyledText {
     return 0;
   }
 
-  /**
-   * Retrieves the value of property at given character position
-   * @param {Number} lineIndex the line number
-   * @param {Number} charIndex the character number
-   * @param {String} property the property name
-   * @returns the value of 'property'
+  /**
+   * Retrieves the value of property at given character position
+   * @param {Number} lineIndex the line number
+   * @param {Number} charIndex the character number
+   * @param {String} property the property name
+   * @returns the value of 'property'
    */
   getValueOfPropertyAt(lineIndex, charIndex, property) {
     var _charStyle$property;
@@ -1160,9 +1212,9 @@ class FabricText extends StyledText {
     return (_charStyle$property = charStyle[property]) !== null && _charStyle$property !== void 0 ? _charStyle$property : this[property];
   }
 
-  /**
-   * @private
-   * @param {CanvasRenderingContext2D} ctx Context to render on
+  /**
+   * @private
+   * @param {CanvasRenderingContext2D} ctx Context to render on
    */
   _renderTextDecoration(ctx, type) {
     if (!this[type] && !this.styleHas(type)) {
@@ -1246,10 +1298,10 @@ class FabricText extends StyledText {
     this._removeShadow(ctx);
   }
 
-  /**
-   * return font declaration string for canvas context
-   * @param {Object} [styleObject] object
-   * @returns {String} font declaration formatted for canvas context.
+  /**
+   * return font declaration string for canvas context
+   * @param {Object} [styleObject] object
+   * @returns {String} font declaration formatted for canvas context.
    */
   _getFontDeclaration() {
     let {
@@ -1263,9 +1315,9 @@ class FabricText extends StyledText {
     return [fontStyle, fontWeight, `${forMeasuring ? this.CACHE_FONT_SIZE : fontSize}px`, parsedFontFamily].join(' ');
   }
 
-  /**
-   * Renders text instance on a specified context
-   * @param {CanvasRenderingContext2D} ctx Context to render on
+  /**
+   * Renders text instance on a specified context
+   * @param {CanvasRenderingContext2D} ctx Context to render on
    */
   render(ctx) {
     if (!this.visible) {
@@ -1280,22 +1332,22 @@ class FabricText extends StyledText {
     super.render(ctx);
   }
 
-  /**
-   * Override this method to customize grapheme splitting
-   * @todo the util `graphemeSplit` needs to be injectable in some way.
-   * is more comfortable to inject the correct util rather than having to override text
-   * in the middle of the prototype chain
-   * @param {string} value
-   * @returns {string[]} array of graphemes
+  /**
+   * Override this method to customize grapheme splitting
+   * @todo the util `graphemeSplit` needs to be injectable in some way.
+   * is more comfortable to inject the correct util rather than having to override text
+   * in the middle of the prototype chain
+   * @param {string} value
+   * @returns {string[]} array of graphemes
    */
   graphemeSplit(value) {
     return graphemeSplit(value);
   }
 
-  /**
-   * Returns the text as an array of lines.
-   * @param {String} text text to split
-   * @returns  Lines in the text
+  /**
+   * Returns the text as an array of lines.
+   * @param {String} text text to split
+   * @returns  Lines in the text
    */
   _splitTextIntoLines(text) {
     const lines = text.split(this._reNewline),
@@ -1315,10 +1367,10 @@ class FabricText extends StyledText {
     };
   }
 
-  /**
-   * Returns object representation of an instance
-   * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
-   * @return {Object} Object representation of an instance
+  /**
+   * Returns object representation of an instance
+   * @param {Array} [propertiesToInclude] Any properties that you might want to additionally include in the output
+   * @return {Object} Object representation of an instance
    */
   toObject() {
     let propertiesToInclude = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -1361,23 +1413,23 @@ class FabricText extends StyledText {
     return this;
   }
 
-  /**
-   * Returns complexity of an instance
-   * @return {Number} complexity
+  /**
+   * Returns complexity of an instance
+   * @return {Number} complexity
    */
   complexity() {
     return 1;
   }
 
-  /**
-   * List of generic font families
-   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-family#generic-name
+  /**
+   * List of generic font families
+   * @see https://developer.mozilla.org/en-US/docs/Web/CSS/font-family#generic-name
    */
 
-  /**
-   * Returns FabricText instance from an SVG element (<b>not yet implemented</b>)
-   * @param {HTMLElement} element Element to parse
-   * @param {Object} [options] Options object
+  /**
+   * Returns FabricText instance from an SVG element (<b>not yet implemented</b>)
+   * @param {HTMLElement} element Element to parse
+   * @param {Object} [options] Options object
    */
   static async fromElement(element, options, cssRules) {
     const parsedAttributes = parseAttributes(element, FabricText.ATTRIBUTE_NAMES, cssRules);
@@ -1416,10 +1468,10 @@ class FabricText extends StyledText {
       scaledDiff = lineHeightDiff * textHeightScaleFactor,
       textHeight = text.getScaledHeight() + scaledDiff;
     let offX = 0;
-    /*
-      Adjust positioning:
-        x/y attributes in SVG correspond to the bottom-left corner of text bounding box
-        fabric output by default at top, left.
+    /*
+      Adjust positioning:
+        x/y attributes in SVG correspond to the bottom-left corner of text bounding box
+        fabric output by default at top, left.
     */
     if (textAnchor === CENTER) {
       offX = text.getScaledWidth() / 2;
@@ -1437,10 +1489,10 @@ class FabricText extends StyledText {
 
   /* _FROM_SVG_END_ */
 
-  /**
-   * Returns FabricText instance from an object representation
-   * @param {Object} object plain js Object to create an instance from
-   * @returns {Promise<FabricText>}
+  /**
+   * Returns FabricText instance from an object representation
+   * @param {Object} object plain js Object to create an instance from
+   * @returns {Promise<FabricText>}
    */
   static fromObject(object) {
     return this._fromObject({
@@ -1451,10 +1503,10 @@ class FabricText extends StyledText {
     });
   }
 }
-/**
- * Properties that requires a text layout recalculation when changed
- * @type string[]
- * @protected
+/**
+ * Properties that requires a text layout recalculation when changed
+ * @type string[]
+ * @protected
  */
 _defineProperty(FabricText, "textLayoutProperties", textLayoutProperties);
 _defineProperty(FabricText, "cacheProperties", [...cacheProperties, ...additionalProps]);
@@ -1462,9 +1514,9 @@ _defineProperty(FabricText, "ownDefaults", textDefaultValues);
 _defineProperty(FabricText, "type", 'Text');
 _defineProperty(FabricText, "genericFonts", ['serif', 'sans-serif', 'monospace', 'cursive', 'fantasy', 'system-ui', 'ui-serif', 'ui-sans-serif', 'ui-monospace', 'ui-rounded', 'math', 'emoji', 'fangsong']);
 /* _FROM_SVG_START_ */
-/**
- * List of attribute names to account for when parsing SVG element (used by {@link FabricText.fromElement})
- * @see: http://www.w3.org/TR/SVG/text.html#TextElement
+/**
+ * List of attribute names to account for when parsing SVG element (used by {@link FabricText.fromElement})
+ * @see: http://www.w3.org/TR/SVG/text.html#TextElement
  */
 _defineProperty(FabricText, "ATTRIBUTE_NAMES", SHARED_ATTRIBUTES.concat('x', 'y', 'dx', 'dy', 'font-family', 'font-style', 'font-weight', 'font-size', 'letter-spacing', 'text-decoration', 'text-anchor'));
 applyMixins(FabricText, [TextSVGExportMixin]);