Merge branch 'master' into mkirova/splitter-spec-changes

Author: ChronosSF

projects/igniteui-angular/src/lib/core/styles/components/splitter/_splitter-theme.scss

@@ -93,7 +93,6 @@
         align-items: center;
         background: $splitter-color;
         border: 1px solid $splitter-color;
-        cursor: row-resize;
         z-index: 99;
         opacity: .68;
         transition: opacity .15s $ease-out-quad !important;
@@ -123,7 +122,6 @@
     %igx-splitter-bar--vertical {
         flex-direction: column;
         height: 100%;
-        cursor: col-resize;
 
         &::before {
             @extend %handle-area--vertical;

projects/igniteui-angular/src/lib/splitter/splitter-bar/splitter-bar.component.html

@@ -1,5 +1,6 @@
 <div class="igx-splitter-bar"
     [class.igx-splitter-bar--vertical]='type === 0'
+    [style.cursor]='cursor'
     igxDrag
     [ghost]="false"
     [dragDirection]='dragDir'

projects/igniteui-angular/src/lib/splitter/splitter-bar/splitter-bar.component.ts

@@ -52,6 +52,17 @@ export class IgxSplitBarComponent {
         return this.type === SplitterType.Horizontal ? 'horizontal' : 'vertical';
     }
 
+    /**
+     * @hidden
+     * @internal
+     */
+    public get cursor() {
+        if (this.resizeDisallowed) {
+            return '';
+        }
+        return this.type === SplitterType.Horizontal ? 'col-resize' : 'row-resize';
+    }
+
     /**
      * Sets/gets the `SplitPaneComponent` associated with the current `SplitBarComponent`.
      * @memberof SplitBarComponent

projects/igniteui-angular/src/lib/splitter/splitter.component.spec.ts

@@ -125,12 +125,15 @@ describe('IgxSplitter', () => {
     });
 
     it('should not allow drag resize if resizable is set to false.', () => {
+        const splitterBarComponent = fixture.debugElement.query(By.css(SPLITTERBAR_CLASS)).context;
+        expect(splitterBarComponent.cursor).toBe('col-resize');
         const pane1 =  splitter.panes.toArray()[0];
         pane1.resizable = false;
-        const splitterBarComponent = fixture.debugElement.query(By.css(SPLITTERBAR_CLASS)).context;
+        fixture.detectChanges();
         const args = {cancel: false};
         splitterBarComponent.onDragStart(args);
         expect(args.cancel).toBeTruthy();
+        expect(splitterBarComponent.cursor).toBe('');
     });
 
     it('should allow resizing with up/down arrow keys', () => {