@neovici/cosmoz-omnitable 8.14.0 → 8.14.3

package/cosmoz-omnitable.js

@@ -95,11 +95,11 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 					>
 						<template slot="templates" data-type="item">
 							<div class="item-row-wrapper">
-								<div selected$="[[ selected ]]" part="itemRow itemRow-[[ index ]]" data-index$="[[ index ]]" class="itemRow">
+								<div selected$="[[ selected ]]" part="itemRow itemRow-[[ index ]]" data-index$="[[ index ]]" class="itemRow" on-click="onItemClick">
 									<input class="checkbox" type="checkbox" checked="[[ selected ]]" on-input="_onCheckboxChange" disabled$="[[ !_dataIsValid ]]" />
 									<cosmoz-omnitable-item-row columns="[[ columns ]]"
 										selected="[[ selected ]]" expanded="{{ expanded }}" item="[[ item ]]" group-on-column="[[ groupOnColumn ]]"
-										on-item-change="[[ onItemChange ]]" on-click="onItemClick">
+										on-item-change="[[ onItemChange ]]">
 									</cosmoz-omnitable-item-row>
 									<paper-icon-button
 										class="expand"
@@ -545,20 +545,26 @@ class Omnitable extends hauntedPolymer(useOmnitable)(mixin({ isEmpty }, translat
 			value && close(); /* eslint-disable-line no-unused-expressions */
 		};
 	}
-	onItemClick(e){
-		const path = e.composedPath(),
-			hasLinks = path.slice(0, path.indexOf(e.currentTarget))
-				.find(e => e.matches?.('a'));
 
-		this.dispatchEvent(new window.CustomEvent('omnitable-item-click', {
-			bubbles: true,
-			composed: true,
-			detail: {
-				item: e.model.item,
-				index: e.model.index,
-				hasLinks
-			}
-		}));
+	onItemClick(e) {
+		const composedPath = e.composedPath(),
+			path = composedPath.slice(0, composedPath.indexOf(e.currentTarget));
+
+		if (path.find((e) => e.matches?.('a, .checkbox, .expand'))) {
+			return;
+		}
+
+
+		this.dispatchEvent(
+			new window.CustomEvent('omnitable-item-click', {
+				bubbles: true,
+				composed: true,
+				detail: {
+					item: e.model.item,
+					index: e.model.index,
+				},
+			})
+		);
 	}
 }
 customElements.define('cosmoz-omnitable', Omnitable);

package/lib/settings/cosmoz-omnitable-settings.js

@@ -72,7 +72,14 @@ const placement = ['bottom-right', ...defaultPlacement],
 				</style>
 				<div class="headline">
 					${_('Sort and filter')}
-					<button class="close" @click=${(e) => e.currentTarget?.blur()}>
+					<button
+						class="close"
+						@click=${(e) => {
+							const tg = e.currentTarget;
+							tg?.focus();
+							tg?.blur();
+						}}
+					>
 						${close}
 					</button>
 				</div>

package/lib/settings/style.css.js

@@ -17,14 +17,15 @@ export default css`
 		font-weight: 500;
 		font-size: 16px;
 		line-height: 0.95;
-		padding: 12px 14px 11px 14px;
+		padding: 10px 14px;
 		display: flex;
+		align-items: center
 	}
 	.close {
 		border: none;
 		background: none;
 		cursor: pointer;
-		padding: 0;
+		padding: 2.5px 6px;
 		margin-left: auto;
 	}
 
@@ -56,6 +57,7 @@ export default css`
 	}
 	.heading svg {
 		margin-left: auto;
+		margin-right: 4px;
 	}
 	.heading[data-opened] svg {
 		transform: scaleY(-1);
@@ -147,6 +149,7 @@ export default css`
 		padding: 14px;
 	}
 	.sg {
+		color: inherit;
 		border: 1px solid rgba(0, 0, 0, 0.2);
 		border-radius: 2px;
 		font-size: 13px;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@neovici/cosmoz-omnitable",
-	"version": "8.14.0",
+	"version": "8.14.3",
 	"description": "[![Build Status](https://travis-ci.org/Neovici/cosmoz-omnitable.svg?branch=master)](https://travis-ci.org/Neovici/cosmoz-omnitable)",
 	"keywords": [
 		"web-components"