From f2cfa1cd32881374800a8ee9727bb889654c8e23 Mon Sep 17 00:00:00 2001 From: burstein Date: Sat, 28 Feb 2026 04:49:12 +0300 Subject: [PATCH] Fixed visibility_action in ios commit_hash:bf63e4f0a3266e7a4fe6bfe78b52b963867873a1 --- .mapping.json | 1 + .../DivKitKMP/DivKitKMP.podspec | 2 +- .../DivKitKMP/DivKitKMP/DivKitKMPFacade.swift | 2 +- .../DivKitKMP/DivKitKMP/DivKitKMPView.swift | 35 ++++++++++ .../DivKitKMP/Example/Podfile.lock | 64 +++++++++---------- .../multiplatform/sample/iosApp/Podfile.lock | 64 +++++++++---------- .../iosApp/iosApp.xcodeproj/project.pbxproj | 2 +- 7 files changed, 103 insertions(+), 67 deletions(-) create mode 100644 client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPView.swift diff --git a/.mapping.json b/.mapping.json index c4a27a64a..a537437f7 100644 --- a/.mapping.json +++ b/.mapping.json @@ -19689,6 +19689,7 @@ "client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPActionHandler.swift":"divkit/public/client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPActionHandler.swift", "client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPErrorReporter.swift":"divkit/public/client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPErrorReporter.swift", "client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPFacade.swift":"divkit/public/client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPFacade.swift", + "client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPView.swift":"divkit/public/client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPView.swift", "client/multiplatform/divkit-multiplatform/DivKitKMP/Example/Example.xcodeproj/project.pbxproj":"divkit/public/client/multiplatform/divkit-multiplatform/DivKitKMP/Example/Example.xcodeproj/project.pbxproj", "client/multiplatform/divkit-multiplatform/DivKitKMP/Example/Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata":"divkit/public/client/multiplatform/divkit-multiplatform/DivKitKMP/Example/Example.xcodeproj/project.xcworkspace/contents.xcworkspacedata", "client/multiplatform/divkit-multiplatform/DivKitKMP/Example/Example.xcworkspace/contents.xcworkspacedata":"divkit/public/client/multiplatform/divkit-multiplatform/DivKitKMP/Example/Example.xcworkspace/contents.xcworkspacedata", diff --git a/client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP.podspec b/client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP.podspec index 9ed083de8..c994d9ff4 100644 --- a/client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP.podspec +++ b/client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'DivKitKMP' - s.version = '32.35.0' + s.version = '32.38.0' s.summary = 'DivKit obj-C interface for Kotlin Multiplatform applications' s.description = 'DivKit obj-C interface for Kotlin Multiplatform applications' s.homepage = 'https://divkit.tech' diff --git a/client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPFacade.swift b/client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPFacade.swift index 5deee3bc5..b4a9c3890 100644 --- a/client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPFacade.swift +++ b/client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPFacade.swift @@ -35,7 +35,7 @@ internal import DivKitExtensions cardId: DivCardID(rawValue: cardId) ) ) - return divView + return DivKitKMPView(divView: divView) } @objc public func getVariableValue(_ name: String) -> Any? { diff --git a/client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPView.swift b/client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPView.swift new file mode 100644 index 000000000..9a008c5ec --- /dev/null +++ b/client/multiplatform/divkit-multiplatform/DivKitKMP/DivKitKMP/DivKitKMPView.swift @@ -0,0 +1,35 @@ +#if os(iOS) +import UIKit + +import DivKit + +final class DivKitKMPView: UIView { + override var intrinsicContentSize: CGSize { + divView.intrinsicContentSize + } + + override func sizeThatFits(_ size: CGSize) -> CGSize { + divView.sizeThatFits(size) + } + + private let divView: DivView + + init(divView: DivView) { + self.divView = divView + super.init(frame: .zero) + + addSubview(divView) + } + + required init?(coder: NSCoder) { + fatalError("init(coder:) has not been implemented") + } + + override func layoutSubviews() { + super.layoutSubviews() + + divView.frame = bounds + divView.onVisibleBoundsChanged(to: bounds) + } +} +#endif diff --git a/client/multiplatform/divkit-multiplatform/DivKitKMP/Example/Podfile.lock b/client/multiplatform/divkit-multiplatform/DivKitKMP/Example/Podfile.lock index c30ce627d..63f1bd8e9 100644 --- a/client/multiplatform/divkit-multiplatform/DivKitKMP/Example/Podfile.lock +++ b/client/multiplatform/divkit-multiplatform/DivKitKMP/Example/Podfile.lock @@ -1,30 +1,30 @@ PODS: - - DivKit (32.35.0): - - DivKit_LayoutKit (= 32.35.0) - - DivKit_Serialization (= 32.35.0) + - DivKit (32.38.0): + - DivKit_LayoutKit (= 32.38.0) + - DivKit_Serialization (= 32.38.0) - VGSL (~> 7.12) - - DivKit_LayoutKit (32.35.0): - - DivKit_LayoutKitInterface (= 32.35.0) + - DivKit_LayoutKit (32.38.0): + - DivKit_LayoutKitInterface (= 32.38.0) - VGSL (~> 7.12) - - DivKit_LayoutKitInterface (32.35.0): + - DivKit_LayoutKitInterface (32.38.0): - VGSL (~> 7.12) - - DivKit_Serialization (32.35.0): + - DivKit_Serialization (32.38.0): - VGSL (~> 7.12) - - DivKitExtensions (32.35.0): - - DivKit (= 32.35.0) - - DivKitKMP (32.35.0): - - DivKit (= 32.35.0) - - DivKitExtensions (= 32.35.0) - - VGSL (7.17.0): - - VGSLFundamentals (= 7.17.0) - - VGSLNetworking (= 7.17.0) - - VGSLUI (= 7.17.0) - - VGSLFundamentals (7.17.0) - - VGSLNetworking (7.17.0): - - VGSLFundamentals (= 7.17.0) - - VGSLUI (= 7.17.0) - - VGSLUI (7.17.0): - - VGSLFundamentals (= 7.17.0) + - DivKitExtensions (32.38.0): + - DivKit (= 32.38.0) + - DivKitKMP (32.38.0): + - DivKit (= 32.38.0) + - DivKitExtensions (= 32.38.0) + - VGSL (7.19.1): + - VGSLFundamentals (= 7.19.1) + - VGSLNetworking (= 7.19.1) + - VGSLUI (= 7.19.1) + - VGSLFundamentals (7.19.1) + - VGSLNetworking (7.19.1): + - VGSLFundamentals (= 7.19.1) + - VGSLUI (= 7.19.1) + - VGSLUI (7.19.1): + - VGSLFundamentals (= 7.19.1) DEPENDENCIES: - DivKitKMP (from `../`) @@ -46,16 +46,16 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - DivKit: 3dbffa1f9b303ba9f95ea4fc2b48375440768da2 - DivKit_LayoutKit: c5025c06af360dc2b1a539b17567bfb628bd3755 - DivKit_LayoutKitInterface: f31972d07134bdd373823ed31c0097eff5b9837f - DivKit_Serialization: c15fa9eb3878dda9710a30a19a395e61a9d2e118 - DivKitExtensions: 2dd13f295a717e0e4de3810b69c8865f90125195 - DivKitKMP: 83316de3342542a9a6a2f49d5bcb8e46d73cdfae - VGSL: 6696dd84229c7d3ce8ad9b940e89bbd199e2b12d - VGSLFundamentals: 5bd45cb6e0b594902aa9f8927402b4d787460bc7 - VGSLNetworking: 4301c663201314d27357078ec8df9dccc631ec62 - VGSLUI: 6cf73663cc3e9fcc808c095f065eb84555a5cd52 + DivKit: 87422c6265ee9f81f483b3ceb63b6bf8f7012c8d + DivKit_LayoutKit: 1b4ea711f425245cfc50ff86d319731458cac19f + DivKit_LayoutKitInterface: 0e9be197ea22efed67c663a609d2f690b6731469 + DivKit_Serialization: c2fab65288397ea29bd91d3966c07d2d12ee608d + DivKitExtensions: 08d57b3cab5ca255ae88f812168380a44b405fc1 + DivKitKMP: 28fa257455a5ea2815cc5f930831bb89d89679ac + VGSL: 11fa7ce04704742563023605ebae5f1f07650402 + VGSLFundamentals: 06fafc043931efd4023be34bd98bec6df05a0080 + VGSLNetworking: dfc9d7a2244def8272afc0ca1af6fd417ecbf7c6 + VGSLUI: e4809e668479fb6c151970d1097a086b6c7c176b PODFILE CHECKSUM: 4009ac52a15ffdedf1dc6002da52adfc1f079b30 diff --git a/client/multiplatform/sample/iosApp/Podfile.lock b/client/multiplatform/sample/iosApp/Podfile.lock index 2dbebbdbc..6c51a1e24 100644 --- a/client/multiplatform/sample/iosApp/Podfile.lock +++ b/client/multiplatform/sample/iosApp/Podfile.lock @@ -1,30 +1,30 @@ PODS: - - DivKit (32.35.0): - - DivKit_LayoutKit (= 32.35.0) - - DivKit_Serialization (= 32.35.0) + - DivKit (32.38.0): + - DivKit_LayoutKit (= 32.38.0) + - DivKit_Serialization (= 32.38.0) - VGSL (~> 7.12) - - DivKit_LayoutKit (32.35.0): - - DivKit_LayoutKitInterface (= 32.35.0) + - DivKit_LayoutKit (32.38.0): + - DivKit_LayoutKitInterface (= 32.38.0) - VGSL (~> 7.12) - - DivKit_LayoutKitInterface (32.35.0): + - DivKit_LayoutKitInterface (32.38.0): - VGSL (~> 7.12) - - DivKit_Serialization (32.35.0): + - DivKit_Serialization (32.38.0): - VGSL (~> 7.12) - - DivKitExtensions (32.35.0): - - DivKit (= 32.35.0) - - DivKitKMP (32.35.0): - - DivKit (= 32.35.0) - - DivKitExtensions (= 32.35.0) - - VGSL (7.19.0): - - VGSLFundamentals (= 7.19.0) - - VGSLNetworking (= 7.19.0) - - VGSLUI (= 7.19.0) - - VGSLFundamentals (7.19.0) - - VGSLNetworking (7.19.0): - - VGSLFundamentals (= 7.19.0) - - VGSLUI (= 7.19.0) - - VGSLUI (7.19.0): - - VGSLFundamentals (= 7.19.0) + - DivKitExtensions (32.38.0): + - DivKit (= 32.38.0) + - DivKitKMP (32.38.0): + - DivKit (= 32.38.0) + - DivKitExtensions (= 32.38.0) + - VGSL (7.19.1): + - VGSLFundamentals (= 7.19.1) + - VGSLNetworking (= 7.19.1) + - VGSLUI (= 7.19.1) + - VGSLFundamentals (7.19.1) + - VGSLNetworking (7.19.1): + - VGSLFundamentals (= 7.19.1) + - VGSLUI (= 7.19.1) + - VGSLUI (7.19.1): + - VGSLFundamentals (= 7.19.1) DEPENDENCIES: - DivKitKMP (from `../../divkit-multiplatform/DivKitKMP`) @@ -46,16 +46,16 @@ EXTERNAL SOURCES: :path: "../../divkit-multiplatform/DivKitKMP" SPEC CHECKSUMS: - DivKit: 3dbffa1f9b303ba9f95ea4fc2b48375440768da2 - DivKit_LayoutKit: c5025c06af360dc2b1a539b17567bfb628bd3755 - DivKit_LayoutKitInterface: f31972d07134bdd373823ed31c0097eff5b9837f - DivKit_Serialization: c15fa9eb3878dda9710a30a19a395e61a9d2e118 - DivKitExtensions: 2dd13f295a717e0e4de3810b69c8865f90125195 - DivKitKMP: 83316de3342542a9a6a2f49d5bcb8e46d73cdfae - VGSL: 75984a3b526265aa3a231ca69f17807079f97c7e - VGSLFundamentals: 3d10d98d88fe1094415b1bf8f473f99f44d4ed2c - VGSLNetworking: 9454665ea5a91f2af656ce4cec064b7292c02d5f - VGSLUI: 11d1a11dbe0b11777eb9f2a73d22508490ccb6de + DivKit: 87422c6265ee9f81f483b3ceb63b6bf8f7012c8d + DivKit_LayoutKit: 1b4ea711f425245cfc50ff86d319731458cac19f + DivKit_LayoutKitInterface: 0e9be197ea22efed67c663a609d2f690b6731469 + DivKit_Serialization: c2fab65288397ea29bd91d3966c07d2d12ee608d + DivKitExtensions: 08d57b3cab5ca255ae88f812168380a44b405fc1 + DivKitKMP: 28fa257455a5ea2815cc5f930831bb89d89679ac + VGSL: 11fa7ce04704742563023605ebae5f1f07650402 + VGSLFundamentals: 06fafc043931efd4023be34bd98bec6df05a0080 + VGSLNetworking: dfc9d7a2244def8272afc0ca1af6fd417ecbf7c6 + VGSLUI: e4809e668479fb6c151970d1097a086b6c7c176b PODFILE CHECKSUM: d6a16f2757fae6a8b9bc890d8f61fa4cd1dabc22 diff --git a/client/multiplatform/sample/iosApp/iosApp.xcodeproj/project.pbxproj b/client/multiplatform/sample/iosApp/iosApp.xcodeproj/project.pbxproj index a38f561f9..8f1bbf5fc 100644 --- a/client/multiplatform/sample/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/client/multiplatform/sample/iosApp/iosApp.xcodeproj/project.pbxproj @@ -211,7 +211,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd \"$SRCROOT/../..\"\n./gradlew :sample:app:embedAndSignAppleFrameworkForXcode\n"; + shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n exit 0\nfi\ncd \"$SRCROOT/../..\"\n./gradlew :sample:app:embedAndSignAppleFrameworkForXcode"; }; /* End PBXShellScriptBuildPhase section */