diff --git a/client/ios/DivKit/Actions/DivActionHandler.swift b/client/ios/DivKit/Actions/DivActionHandler.swift index 370b5eb6d..215f74a48 100644 --- a/client/ios/DivKit/Actions/DivActionHandler.swift +++ b/client/ios/DivKit/Actions/DivActionHandler.swift @@ -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 @@ -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) } } } diff --git a/client/ios/DivKit/Timers/DivTimerStorage.swift b/client/ios/DivKit/Timers/DivTimerStorage.swift index 242a53614..5a2aaf28d 100644 --- a/client/ios/DivKit/Timers/DivTimerStorage.swift +++ b/client/ios/DivKit/Timers/DivTimerStorage.swift @@ -153,7 +153,7 @@ final class DivTimerStorage { actionHandler.handle( $0, cardId: cardId, - source: .custom, + source: .timer, sender: nil ) } diff --git a/client/ios/DivKit/Variables/DivTriggersStorage.swift b/client/ios/DivKit/Variables/DivTriggersStorage.swift index 3c133c2d4..dce8ecbdb 100644 --- a/client/ios/DivKit/Variables/DivTriggersStorage.swift +++ b/client/ios/DivKit/Variables/DivTriggersStorage.swift @@ -91,7 +91,7 @@ public final class DivTriggersStorage { actionHandler?.handle( $0, cardId: cardId, - source: .custom, + source: .trigger, sender: nil ) } diff --git a/client/ios/DivKitSnapshotTests/DivKitSnapshotTestCase.swift b/client/ios/DivKitSnapshotTests/DivKitSnapshotTestCase.swift index 75f8f5389..ab4779f69 100644 --- a/client/ios/DivKitSnapshotTests/DivKitSnapshotTestCase.swift +++ b/client/ios/DivKitSnapshotTests/DivKitSnapshotTestCase.swift @@ -136,7 +136,7 @@ open class DivKitSnapshotTestCase: XCTestCase { divKitComponents.actionHandler.handle( divAction, cardId: testDivCardId, - source: .custom, + source: .tap, sender: nil ) } diff --git a/client/ios/LayoutKit/Interface/UserInterfaceAction.swift b/client/ios/LayoutKit/Interface/UserInterfaceAction.swift index 82d92aa26..60fd90725 100644 --- a/client/ios/LayoutKit/Interface/UserInterfaceAction.swift +++ b/client/ios/LayoutKit/Interface/UserInterfaceAction.swift @@ -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