From bbe4dd9a10ae1dcf1e72d0eaa56cb947ecb77891 Mon Sep 17 00:00:00 2001 From: "p.strelchenko" Date: Tue, 12 May 2026 17:49:11 +0500 Subject: [PATCH] =?UTF-8?q?[MOB-60077]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D1=8F=D0=B5=D1=82=20=D0=BF=D1=80=D0=BE=D0=B1=D1=80=D0=BE?= =?UTF-8?q?=D1=81=20rawValues=20=D0=B2=20=D1=82=D0=BE=D0=BA=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20letterSpacing=20=D0=B8=D0=B7=20Figma?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 11 ++++++----- Demo/.figmagen.yml | 3 ++- .../Generators/Tokens/Contexts/TypographyToken.swift | 10 +++++++++- .../Typography/DefaultTypographyTokensGenerator.swift | 3 ++- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a287e83..2bf9a55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,13 +18,14 @@ env: jobs: macOS: name: macOS - runs-on: macOS-13 + runs-on: macos-15 env: - DEVELOPER_DIR: /Applications/Xcode_15.1.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer SWIFTLINT_VERSION: 0.52.2 DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }} + FIGMAGEN_ACCESS_TOKEN: ${{ secrets.FIGMAGEN_ACCESS_TOKEN }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Ruby uses: ruby/setup-ruby@v1 - name: Bundler @@ -49,7 +50,7 @@ jobs: container: image: swift:5.9 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install dependencies run: | apt-get update @@ -72,7 +73,7 @@ jobs: name: CocoaPods runs-on: macOS-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Ruby uses: ruby/setup-ruby@v1 - name: Bundler diff --git a/Demo/.figmagen.yml b/Demo/.figmagen.yml index 8253f18..f44d7d2 100644 --- a/Demo/.figmagen.yml +++ b/Demo/.figmagen.yml @@ -1,5 +1,6 @@ base: - accessToken: 25961-4ac9fbc9-3bd8-4c43-bbe2-95e477f8a067 + accessToken: + env: FIGMAGEN_ACCESS_TOKEN colorStyles: file: https://www.figma.com/file/61xw2FQn61Xr7VVFYwiHHy/Fugen-Demo?node-id=91%3A3 diff --git a/Sources/FigmaGen/Generators/Tokens/Contexts/TypographyToken.swift b/Sources/FigmaGen/Generators/Tokens/Contexts/TypographyToken.swift index 28d06cf..8cd2cb0 100644 --- a/Sources/FigmaGen/Generators/Tokens/Contexts/TypographyToken.swift +++ b/Sources/FigmaGen/Generators/Tokens/Contexts/TypographyToken.swift @@ -6,12 +6,20 @@ struct TypographyToken { typealias FontSizeToken = ContextToken typealias FontScaleToken = ContextToken - typealias LetterSpacingToken = ContextToken typealias LineHeightToken = ContextToken typealias TextDecorationToken = ContextToken typealias ParagraphSpacingToken = ContextToken typealias ParagraphIndentToken = ContextToken + struct LetterSpacingToken { + + // MARK: - Instance Properties + + let path: [String] + let value: String + let rawValue: String + } + // MARK: - Instance Properties let path: [String] diff --git a/Sources/FigmaGen/Generators/Tokens/Generators/Typography/DefaultTypographyTokensGenerator.swift b/Sources/FigmaGen/Generators/Tokens/Generators/Typography/DefaultTypographyTokensGenerator.swift index ea3d501..882811d 100644 --- a/Sources/FigmaGen/Generators/Tokens/Generators/Typography/DefaultTypographyTokensGenerator.swift +++ b/Sources/FigmaGen/Generators/Tokens/Generators/Typography/DefaultTypographyTokensGenerator.swift @@ -85,7 +85,8 @@ final class DefaultTypographyTokensGenerator: TypographyTokensGenerator { return TypographyToken.LetterSpacingToken( path: letterSpacingValue.components(separatedBy: "."), - value: String(round(fontLetterSpacing * 100) / 100.0) + value: String(round(fontLetterSpacing * 100) / 100.0), + rawValue: String(letterSpacing) ) }