Merge branch 'master' of https://github.com/primefaces/primevue

src/components/sidebar/Sidebar.vue

@@ -2,10 +2,12 @@
     <Teleport to="body">
         <transition name="p-sidebar" @enter="onEnter" @leave="onLeave" @after-leave="onAfterLeave" appear>
             <div :class="containerClass" v-if="visible" :ref="containerRef" role="complementary" :aria-modal="modal" v-bind="$attrs">
-                <div class="p-sidebar-content">
+                <div class="p-sidebar-header">
-                    <button class="p-sidebar-close p-link" @click="hide" :aria-label="ariaCloseLabel" v-if="showCloseIcon" type="button" v-ripple>
+                    <button class="p-sidebar-close p-sidebar-icon p-link" @click="hide" :aria-label="ariaCloseLabel" v-if="showCloseIcon" type="button" v-ripple>
                         <span class="p-sidebar-close-icon pi pi-times" />
                     </button>
+                </div>
+                <div class="p-sidebar-content">
                     <slot></slot>
                 </div>
             </div>
@@ -171,21 +173,25 @@ export default {
 .p-sidebar {
     position: fixed;
     transition: transform .3s;
-    overflow: scroll;
+    display: flex;
+    flex-direction: column;
 }
 
 .p-sidebar-content {
     position: relative;
+    overflow-y: auto;
 }
 
-.p-sidebar-close {
+.p-sidebar-header {
-    position: absolute;
+    display: flex;
-    top: 0;
+    align-items: center;
-    right: 0;
+    justify-content: flex-end;
+}
+
+.p-sidebar-icon {
     display: flex;
     align-items: center;
     justify-content: center;
-    overflow: hidden;
 }
 
 .p-sidebar-mask {

src/components/tabview/TabView.vue

@@ -90,7 +90,7 @@ export default {
                     if (this.isTabPanel(child)) {
                         tabs.push(child);
                     }
-                    else if (child.children.length > 0) {
+                    else if (child.children && child.children instanceof Array) {
                         child.children.forEach(nestedChild => {
                             if (this.isTabPanel(nestedChild)) {
                                 tabs.push(nestedChild)