Skip to content

Commit

Permalink
Release 28.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
robot-divkit committed Oct 16, 2023
1 parent 13588af commit 796c8db
Show file tree
Hide file tree
Showing 14 changed files with 154 additions and 27 deletions.
5 changes: 5 additions & 0 deletions .mapping.json
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,7 @@
"Specs/DivKit/28.3.0/DivKit.podspec":"divkit/public-ios/Specs/DivKit/28.3.0/DivKit.podspec",
"Specs/DivKit/28.4.0/DivKit.podspec":"divkit/public-ios/Specs/DivKit/28.4.0/DivKit.podspec",
"Specs/DivKit/28.5.1/DivKit.podspec":"divkit/public-ios/Specs/DivKit/28.5.1/DivKit.podspec",
"Specs/DivKit/28.6.0/DivKit.podspec":"divkit/public-ios/Specs/DivKit/28.6.0/DivKit.podspec",
"Specs/DivKitExtensions/24.3.0/DivKitExtensions.podspec":"divkit/public-ios/Specs/DivKitExtensions/24.3.0/DivKitExtensions.podspec",
"Specs/DivKitExtensions/25.0.0/DivKitExtensions.podspec":"divkit/public-ios/Specs/DivKitExtensions/25.0.0/DivKitExtensions.podspec",
"Specs/DivKitExtensions/25.1.0/DivKitExtensions.podspec":"divkit/public-ios/Specs/DivKitExtensions/25.1.0/DivKitExtensions.podspec",
Expand All @@ -836,24 +837,28 @@
"Specs/DivKitExtensions/28.3.0/DivKitExtensions.podspec":"divkit/public-ios/Specs/DivKitExtensions/28.3.0/DivKitExtensions.podspec",
"Specs/DivKitExtensions/28.4.0/DivKitExtensions.podspec":"divkit/public-ios/Specs/DivKitExtensions/28.4.0/DivKitExtensions.podspec",
"Specs/DivKitExtensions/28.5.1/DivKitExtensions.podspec":"divkit/public-ios/Specs/DivKitExtensions/28.5.1/DivKitExtensions.podspec",
"Specs/DivKitExtensions/28.6.0/DivKitExtensions.podspec":"divkit/public-ios/Specs/DivKitExtensions/28.6.0/DivKitExtensions.podspec",
"Specs/DivKit_LayoutKit/28.0.1/DivKit_LayoutKit.podspec":"divkit/public-ios/Specs/DivKit_LayoutKit/28.0.1/DivKit_LayoutKit.podspec",
"Specs/DivKit_LayoutKit/28.1.0/DivKit_LayoutKit.podspec":"divkit/public-ios/Specs/DivKit_LayoutKit/28.1.0/DivKit_LayoutKit.podspec",
"Specs/DivKit_LayoutKit/28.2.0/DivKit_LayoutKit.podspec":"divkit/public-ios/Specs/DivKit_LayoutKit/28.2.0/DivKit_LayoutKit.podspec",
"Specs/DivKit_LayoutKit/28.3.0/DivKit_LayoutKit.podspec":"divkit/public-ios/Specs/DivKit_LayoutKit/28.3.0/DivKit_LayoutKit.podspec",
"Specs/DivKit_LayoutKit/28.4.0/DivKit_LayoutKit.podspec":"divkit/public-ios/Specs/DivKit_LayoutKit/28.4.0/DivKit_LayoutKit.podspec",
"Specs/DivKit_LayoutKit/28.5.1/DivKit_LayoutKit.podspec":"divkit/public-ios/Specs/DivKit_LayoutKit/28.5.1/DivKit_LayoutKit.podspec",
"Specs/DivKit_LayoutKit/28.6.0/DivKit_LayoutKit.podspec":"divkit/public-ios/Specs/DivKit_LayoutKit/28.6.0/DivKit_LayoutKit.podspec",
"Specs/DivKit_LayoutKitInterface/28.0.1/DivKit_LayoutKitInterface.podspec":"divkit/public-ios/Specs/DivKit_LayoutKitInterface/28.0.1/DivKit_LayoutKitInterface.podspec",
"Specs/DivKit_LayoutKitInterface/28.1.0/DivKit_LayoutKitInterface.podspec":"divkit/public-ios/Specs/DivKit_LayoutKitInterface/28.1.0/DivKit_LayoutKitInterface.podspec",
"Specs/DivKit_LayoutKitInterface/28.2.0/DivKit_LayoutKitInterface.podspec":"divkit/public-ios/Specs/DivKit_LayoutKitInterface/28.2.0/DivKit_LayoutKitInterface.podspec",
"Specs/DivKit_LayoutKitInterface/28.3.0/DivKit_LayoutKitInterface.podspec":"divkit/public-ios/Specs/DivKit_LayoutKitInterface/28.3.0/DivKit_LayoutKitInterface.podspec",
"Specs/DivKit_LayoutKitInterface/28.4.0/DivKit_LayoutKitInterface.podspec":"divkit/public-ios/Specs/DivKit_LayoutKitInterface/28.4.0/DivKit_LayoutKitInterface.podspec",
"Specs/DivKit_LayoutKitInterface/28.5.1/DivKit_LayoutKitInterface.podspec":"divkit/public-ios/Specs/DivKit_LayoutKitInterface/28.5.1/DivKit_LayoutKitInterface.podspec",
"Specs/DivKit_LayoutKitInterface/28.6.0/DivKit_LayoutKitInterface.podspec":"divkit/public-ios/Specs/DivKit_LayoutKitInterface/28.6.0/DivKit_LayoutKitInterface.podspec",
"Specs/DivKit_Serialization/28.0.1/DivKit_Serialization.podspec":"divkit/public-ios/Specs/DivKit_Serialization/28.0.1/DivKit_Serialization.podspec",
"Specs/DivKit_Serialization/28.1.0/DivKit_Serialization.podspec":"divkit/public-ios/Specs/DivKit_Serialization/28.1.0/DivKit_Serialization.podspec",
"Specs/DivKit_Serialization/28.2.0/DivKit_Serialization.podspec":"divkit/public-ios/Specs/DivKit_Serialization/28.2.0/DivKit_Serialization.podspec",
"Specs/DivKit_Serialization/28.3.0/DivKit_Serialization.podspec":"divkit/public-ios/Specs/DivKit_Serialization/28.3.0/DivKit_Serialization.podspec",
"Specs/DivKit_Serialization/28.4.0/DivKit_Serialization.podspec":"divkit/public-ios/Specs/DivKit_Serialization/28.4.0/DivKit_Serialization.podspec",
"Specs/DivKit_Serialization/28.5.1/DivKit_Serialization.podspec":"divkit/public-ios/Specs/DivKit_Serialization/28.5.1/DivKit_Serialization.podspec",
"Specs/DivKit_Serialization/28.6.0/DivKit_Serialization.podspec":"divkit/public-ios/Specs/DivKit_Serialization/28.6.0/DivKit_Serialization.podspec",
"Specs/LayoutKit/24.3.0/LayoutKit.podspec":"divkit/public-ios/Specs/LayoutKit/24.3.0/LayoutKit.podspec",
"Specs/LayoutKit/25.0.0/LayoutKit.podspec":"divkit/public-ios/Specs/LayoutKit/25.0.0/LayoutKit.podspec",
"Specs/LayoutKit/25.1.0/LayoutKit.podspec":"divkit/public-ios/Specs/LayoutKit/25.1.0/LayoutKit.podspec",
Expand Down
8 changes: 4 additions & 4 deletions DivKit/Actions/DivActionHandler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ public final class DivActionHandler {
) {
let action: DivActionBase?
switch params.source {
case .tap, .custom:
action = parseAction(type: DivActionTemplate.self, json: params.action)
case .visibility:
action = parseAction(type: DivVisibilityActionTemplate.self, json: params.action)
case .disappear:
action = parseAction(type: DivDisappearActionTemplate.self, json: params.action)
default:
action = parseAction(type: DivActionTemplate.self, json: params.action)
}
guard let action = action else {
return
Expand Down Expand Up @@ -188,12 +188,12 @@ public final class DivActionHandler {

if !isDivActionURLHandled {
switch source {
case .tap, .custom:
urlHandler.handle(url, sender: sender)
case .visibility, .disappear:
// For visibility actions url is treated as logUrl.
let referer = action.resolveReferer(expressionResolver)
logger.log(url: url, referer: referer, payload: action.payload)
default:
urlHandler.handle(url, sender: sender)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion DivKit/DivKitInfo.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
public enum DivKitInfo {
public static let version = "28.5.1"
public static let version = "28.6.0"
}
4 changes: 2 additions & 2 deletions DivKit/Extensions/DivContainerExtensions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ extension DivContainer: DivBlockModeling {
orientation: Orientation,
context: DivBlockModelingContext
) -> DivOverridenSize? {
if width.isIntrinsic {
if context.override(width: width).isIntrinsic {
switch orientation {
case .horizontal:
if items.hasHorizontallyMatchParent {
Expand All @@ -76,7 +76,7 @@ extension DivContainer: DivBlockModeling {
orientation: Orientation,
context: DivBlockModelingContext
) -> DivOverridenSize? {
if height.isIntrinsic {
if context.override(height: height).isIntrinsic {
switch orientation {
case .horizontal, .overlap:
if items.allVerticallyMatchParent {
Expand Down
2 changes: 1 addition & 1 deletion DivKit/Timers/DivTimerStorage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ final class DivTimerStorage {
actionHandler.handle(
$0,
cardId: cardId,
source: .custom,
source: .timer,
sender: nil
)
}
Expand Down
2 changes: 1 addition & 1 deletion DivKit/Variables/DivTriggersStorage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public final class DivTriggersStorage {
actionHandler?.handle(
$0,
cardId: cardId,
source: .custom,
source: .trigger,
sender: nil
)
}
Expand Down
3 changes: 2 additions & 1 deletion LayoutKit/Interface/UserInterfaceAction.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ public struct UserInterfaceAction: Equatable, Codable {
public enum DivActionSource: String {
case tap
case visibility
case custom
case disappear
case timer
case trigger
}

public let payload: Payload
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,26 +98,27 @@ private final class TransitioningBlockView: BlockView, VisibleBoundsTrackingCont
completion: { self.fromView = nil }
)

let item = DispatchWorkItem { [weak self] in
guard let self = self else { return }
self.toView = model.block.to.reuse(
self.toView,
observer: observer,
overscrollDelegate: overscrollDelegate,
renderingDelegate: renderingDelegate,
superview: self
)

self.addAnimationsToView(self.toView, animations: animationIn) {
if UIAccessibility.isVoiceOverRunning {
self.forRecursiveSubviews {
if $0.accessibilityElementIsFocused() {
UIAccessibility.post(notification: .layoutChanged, argument: $0)
let item =
DispatchWorkItem { [weak self, weak observer, weak overscrollDelegate, weak renderingDelegate] in
guard let self = self else { return }
self.toView = model.block.to.reuse(
self.toView,
observer: observer,
overscrollDelegate: overscrollDelegate,
renderingDelegate: renderingDelegate,
superview: self
)

self.addAnimationsToView(self.toView, animations: animationIn) {
if UIAccessibility.isVoiceOverRunning {
self.forRecursiveSubviews {
if $0.accessibilityElementIsFocused() {
UIAccessibility.post(notification: .layoutChanged, argument: $0)
}
}
}
}
}
}

toViewAnimationWorkItem?.cancel()
toViewAnimationWorkItem = item
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import PackageDescription
let vgsl = (
url: "https://github.com/yandex/vgsl.git",
packageName: "vgsl",
version: Version("2.2.0")
version: Version("2.3.0")
)

let package = Package(
Expand Down
25 changes: 25 additions & 0 deletions Specs/DivKit/28.6.0/DivKit.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Pod::Spec.new do |s|
s.name = 'DivKit'
s.version = '28.6.0'
s.summary = 'DivKit framework'
s.description = 'DivKit is a backend-driven UI framework'
s.homepage = 'https://divkit.tech'

s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { 'divkit' => 'divkit@yandex-team.ru' }
s.source = { :git => 'https://github.com/divkit/divkit-ios.git', :tag => s.version.to_s }

s.swift_version = '5.7'
s.requires_arc = true
s.prefix_header_file = false
s.platforms = { :ios => '11.0' }

s.dependency 'DivKit_LayoutKit', s.version.to_s
s.dependency 'DivKit_Serialization', s.version.to_s
s.dependency 'VGSLCommonCore', '~> 2.3'
s.dependency 'VGSLNetworking', '~> 2.3'

s.source_files = [
'DivKit/**/*'
]
end
22 changes: 22 additions & 0 deletions Specs/DivKitExtensions/28.6.0/DivKitExtensions.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Pod::Spec.new do |s|
s.name = 'DivKitExtensions'
s.version = '28.6.0'
s.summary = 'DivKit framework extensions'
s.description = 'Part of DivKit framework'
s.homepage = 'https://divkit.tech'

s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { 'divkit' => 'divkit@yandex-team.ru' }
s.source = { :git => 'https://github.com/divkit/divkit-ios.git', :tag => s.version.to_s }

s.swift_version = '5.7'
s.requires_arc = true
s.prefix_header_file = false
s.platforms = { :ios => '11.0' }

s.dependency 'DivKit', s.version.to_s

s.source_files = [
'DivKitExtensions/**/*'
]
end
24 changes: 24 additions & 0 deletions Specs/DivKit_LayoutKit/28.6.0/DivKit_LayoutKit.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Pod::Spec.new do |s|
s.name = 'DivKit_LayoutKit'
s.module_name = 'LayoutKit'
s.version = '28.6.0'
s.summary = 'Part of DivKit framework'
s.description = 'Part of DivKit framework'
s.homepage = 'https://divkit.tech'

s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { 'divkit' => 'divkit@yandex-team.ru' }
s.source = { :git => 'https://github.com/divkit/divkit-ios.git', :tag => s.version.to_s }

s.swift_version = '5.7'
s.requires_arc = true
s.prefix_header_file = false
s.platforms = { :ios => '11.0' }

s.dependency 'DivKit_LayoutKitInterface', s.version.to_s
s.dependency 'VGSLCommonCore', '~> 2.3'

s.source_files = [
'LayoutKit/LayoutKit/**/*'
]
end
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Pod::Spec.new do |s|
s.name = 'DivKit_LayoutKitInterface'
s.module_name = 'LayoutKitInterface'
s.version = '28.6.0'
s.summary = 'Part of DivKit framework'
s.description = 'Part of DivKit framework'
s.homepage = 'https://divkit.tech'

s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { 'divkit' => 'divkit@yandex-team.ru' }
s.source = { :git => 'https://github.com/divkit/divkit-ios.git', :tag => s.version.to_s }

s.swift_version = '5.7'
s.requires_arc = true
s.prefix_header_file = false
s.platforms = { :ios => '11.0' }

s.dependency 'VGSLBase', '~> 2.3'
s.dependency 'VGSLBaseTiny', '~> 2.3'
s.dependency 'VGSLBaseUI', '~> 2.3'

s.source_files = [
'LayoutKit/Interface/**/*'
]
end
24 changes: 24 additions & 0 deletions Specs/DivKit_Serialization/28.6.0/DivKit_Serialization.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Pod::Spec.new do |s|
s.name = 'DivKit_Serialization'
s.module_name = 'Serialization'
s.version = '28.6.0'
s.summary = 'Serialization'
s.summary = 'Part of DivKit framework'
s.description = 'Part of DivKit framework'
s.homepage = 'https://divkit.tech'

s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { 'divkit' => 'divkit@yandex-team.ru' }
s.source = { :git => 'https://github.com/divkit/divkit-ios.git', :tag => s.version.to_s }

s.swift_version = '5.7'
s.requires_arc = true
s.prefix_header_file = false
s.platforms = { :ios => '11.0' }

s.dependency 'VGSLCommonCore', '~> 2.3'

s.source_files = [
'Serialization/**/*'
]
end

0 comments on commit 796c8db

Please sign in to comment.