soccer-jersey-fork 1.0.93 → 1.0.95

package/lib/patterns/patterns.js

@@ -170,39 +170,41 @@ export const drawSleeveContrastingTwoColors = (page, primaryColor, secondaryColo
     });
 };
 export const drawSingleBand = (page, primaryColor, secondaryColor, bandStyle) => {
+    function drawVertical(moveX) {
+        return page.pattern(90, 90, function (add) {
+            add.rect(90, 100).fill(primaryColor);
+            add.rect(20, 100).fill(secondaryColor).move(moveX, 0);
+        });
+    }
     switch (bandStyle) {
         case "diagonalRight":
             return page.pattern(100, 100, function (add) {
                 add.rect(100, 100).fill(primaryColor);
-                add.rect(120, 20).fill(secondaryColor).move(0, 40).rotate(120);
+                add.rect(120, 20).fill(secondaryColor).move(-5, 40).rotate(120);
             });
         case "diagonalLeft":
             return page.pattern(100, 100, function (add) {
                 add.rect(100, 100).fill(primaryColor);
-                add.rect(120, 20).fill(secondaryColor).move(0, 40).rotate(60);
+                add.rect(120, 20).fill(secondaryColor).move(-5, 40).rotate(60);
             });
         case "horizontal":
             return page.pattern(100, 90, function (add) {
                 add.rect(100, 90).fill(primaryColor);
                 add.rect(100, 30).fill(secondaryColor).move(0, 30);
             });
-        case "vertical":
-            return page.pattern(90, 100, function (add) {
-                add.rect(90, 100).fill(primaryColor);
-                add.rect(20, 100).fill(secondaryColor).move(40, 0);
-            });
+        case "offsetRightVertical":
+            return drawVertical(50);
+        case "offsetLeftVertical":
+            return drawVertical(30);
         default:
-            return page.pattern(90, 90, function (add) {
-                add.rect(90, 100).fill(primaryColor);
-                add.rect(20, 100).fill(secondaryColor).move(50, 0);
-            });
+            return drawVertical(40);
     }
 };
 export const drawSingleBandThin = (page, primaryColor, secondaryColor, bandStyle) => {
-    const drawVertical = (x) => {
+    const drawVertical = (moveX) => {
         return page.pattern(90, 100, function (add) {
             add.rect(90, 100).fill(primaryColor);
-            add.rect(10, 100).fill(secondaryColor).move(x, 0);
+            add.rect(10, 100).fill(secondaryColor).move(moveX, 0);
         });
     };
     switch (bandStyle) {
@@ -217,6 +219,10 @@ export const drawSingleBandThin = (page, primaryColor, secondaryColor, bandStyle
                 add.rect(100, 90).fill(primaryColor);
                 add.rect(100, 10).fill(secondaryColor).move(0, 35);
             });
+        case "offsetRightVertical":
+            return drawVertical(55);
+        case "offsetLeftVertical":
+            return drawVertical(35);
         case "vertical":
             return drawVertical(45);
         default:

package/lib/types/index.d.ts

@@ -43,6 +43,6 @@ export interface DrawSoccerJerseyProps {
     withBadge?: boolean;
     withShorts?: boolean;
 }
-export type StyleDirection = "diagonalRight" | "diagonalLeft" | "horizontal" | "vertical";
+export type StyleDirection = "diagonalRight" | "diagonalLeft" | "horizontal" | "vertical" | "offsetLeftVertical" | "offsetRightVertical";
 export type ShirtStyle = "plain" | "twoColors" | "contrastingTwoColors" | "striped" | "stripedThin" | "stripedThick" | "waves" | "checkered" | "checkeredBig" | "diamonds" | "singleBandThin" | "singleBand" | "dashed" | "cross";
 export type SleeveStyle = ShirtStyle;

package/lib/utils/draw-soccer-jersey.js

@@ -152,6 +152,11 @@ export default function drawSoccerJersey({ shirtColor = "plain", shirtStyle, shi
             });
         }
     }
+    if (images && images.length > 0) {
+        for (const { src, width = 20, height = 20, x = 45, y = 45 } of images) {
+            page.image(src).size(width, height).move(x, y);
+        }
+    }
     /**
      * Texts and images should be placed at last so they won't get covered by shirt and shorts
      */
@@ -192,11 +197,6 @@ export default function drawSoccerJersey({ shirtColor = "plain", shirtStyle, shi
             drawText(page);
         }
     }
-    if (images && images.length > 0) {
-        for (const { src, width = 20, height = 20, x = 45, y = 45 } of images) {
-            page.image(src).size(width, height).move(x, y);
-        }
-    }
     page.width(shirtWidth);
     // +10 is some extra room with the shorts height, so the total should be 150
     page.viewbox(`0 0 102 ${100 + (withShorts ? shortsHeight + 10 : 0)}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soccer-jersey-fork",
-  "version": "1.0.93",
+  "version": "1.0.95",
   "description": "Generate soccer jerseys in SVG format",
   "main": "lib/index.js",
   "scripts": {