Skip to content
This repository has been archived by the owner on Jun 1, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into release/1.10.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Tiagoperes authored Oct 14, 2021
2 parents 92fa744 + e6abc30 commit 3218ee0
Show file tree
Hide file tree
Showing 47 changed files with 18 additions and 1,029 deletions.
24 changes: 0 additions & 24 deletions src/__tests__/components/__snapshots__/beagle-modal.spec.ts.snap

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion src/__tests__/components/beagle-grid-view.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import { buildBeagleTestModuleMetadata } from './test-module-builder'
let component: BeagleGridViewComponent
let fixture: ComponentFixture<BeagleGridViewComponent>


describe('BeagleGridViewComponent', () => {

beforeEach(async(() => {
Expand Down
60 changes: 0 additions & 60 deletions src/__tests__/components/beagle-modal.spec.ts

This file was deleted.

44 changes: 0 additions & 44 deletions src/__tests__/components/beagle-tab-view.spec.ts

This file was deleted.

61 changes: 0 additions & 61 deletions src/__tests__/components/beagle-text-area.spec.ts

This file was deleted.

2 changes: 0 additions & 2 deletions src/__tests__/components/beagle-touchable.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ let component: BeagleTouchableComponent
let fixture: ComponentFixture<BeagleTouchableComponent>

describe('BeagleTouchableComponent', () => {


beforeEach(async(() => {
TestBed.configureTestingModule(buildBeagleTestModuleMetadata([BeagleTouchableComponent]))
.compileComponents()
Expand Down
14 changes: 2 additions & 12 deletions src/components/beagle-button/beagle-button.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/
import { AfterViewInit, Component, Input, ViewEncapsulation } from '@angular/core'
import { ClickEvent, IdentifiableBeagleUIElement } from '@zup-it/beagle-web'
import { IdentifiableBeagleUIElement } from '@zup-it/beagle-web'
import { Properties as CSSProperties } from 'csstype'

import { BeagleComponent } from '../../runtime/BeagleComponent'
Expand All @@ -33,7 +33,6 @@ export class BeagleButtonComponent extends BeagleComponent
@Input() styleId?: string
@Input() onPress?: () => void
@Input() style?: CSSProperties
@Input() clickAnalyticsEvent?: ClickEvent
@Input() enabled?: boolean
public usefulStyle: Record<string, any> = {}
public type = 'button'
Expand Down Expand Up @@ -62,16 +61,7 @@ export class BeagleButtonComponent extends BeagleComponent
}

handleClick() {
this.onPress && this.type === 'button' && this.onPress()

if (this.getViewContentManager instanceof Function) {
const beagleService = this.getViewContentManager().getView().getBeagleService()
const analytics = beagleService ? beagleService.analytics : null

if (this.clickAnalyticsEvent && analytics) {
analytics.trackEventOnClick(this.clickAnalyticsEvent)
}
}
this.onPress && this.type === 'button' && this.onPress()
}

private isSubmitButton(element: IdentifiableBeagleUIElement<any> | null) {
Expand Down
8 changes: 1 addition & 7 deletions src/components/beagle-input/beagle-input.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ export class BeagleInputComponent extends BaseComponent

@Input() value?: string
@Input() placeholder?: string
/**
* @deprecated since version 1.7.0.
* Use field `enabled` to control whether the button is enabled or not in the layout
*/
@Input() disabled?: boolean
@Input() enabled?: boolean
@Input() readOnly?: boolean
@Input() type?: InputType
Expand All @@ -47,15 +42,14 @@ export class BeagleInputComponent extends BaseComponent
ngOnInit() {
this.value = this.value || ''
this.placeholder = this.placeholder || ''
this.disabled = this.disabled
this.enabled = this.enabled
this.readOnly = this.readOnly || false
this.type = this.type || 'TEXT'
this.showError = this.showError || false
}

public get inputEnabled(): boolean {
return this.enabled !== false && this.disabled !== true
return this.enabled !== false
}

public handleChange(value) {
Expand Down
1 change: 0 additions & 1 deletion src/components/beagle-lazy/beagle-lazy.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ export class BeagleLazyComponent extends BeagleComponent implements BeagleLazyIn
onChangeTree: tree => this.replaceChildren(tree),
retry: this.fetchLazyView,
shouldShowLoading: false,
...beagleView.getNetworkOptions(),
})
}

Expand Down
27 changes: 0 additions & 27 deletions src/components/beagle-modal/beagle-modal.component.html

This file was deleted.

36 changes: 0 additions & 36 deletions src/components/beagle-modal/beagle-modal.component.less

This file was deleted.

Loading

0 comments on commit 3218ee0

Please sign in to comment.