diff --git a/application/src/main/data/json/system/widget_bundles/buttons.json b/application/src/main/data/json/system/widget_bundles/buttons.json index effff6a27a..1c498fc0c4 100644 --- a/application/src/main/data/json/system/widget_bundles/buttons.json +++ b/application/src/main/data/json/system/widget_bundles/buttons.json @@ -10,6 +10,7 @@ "widgetTypeFqns": [ "action_button", "command_button", + "toggle_button", "power_button" ] } \ No newline at end of file diff --git a/application/src/main/data/json/system/widget_bundles/control_widgets.json b/application/src/main/data/json/system/widget_bundles/control_widgets.json index 560063a2c4..f61219bfe6 100644 --- a/application/src/main/data/json/system/widget_bundles/control_widgets.json +++ b/application/src/main/data/json/system/widget_bundles/control_widgets.json @@ -10,6 +10,7 @@ "widgetTypeFqns": [ "single_switch", "command_button", + "toggle_button", "power_button", "slider", "control_widgets.switch_control", diff --git a/application/src/main/data/json/system/widget_types/toggle_button.json b/application/src/main/data/json/system/widget_types/toggle_button.json new file mode 100644 index 0000000000..a7e2ae9312 --- /dev/null +++ b/application/src/main/data/json/system/widget_types/toggle_button.json @@ -0,0 +1,37 @@ +{ + "fqn": "toggle_button", + "name": "Toggle button", + "deprecated": false, + "image": "tb-image:VG9nZ2xlIGJ1dHRvbnMuc3Zn:IlRvZ2dsZSBidXR0b24iIHN5c3RlbSB3aWRnZXQgaW1hZ2U=;data:image/svg+xml;base64,<svg width="216" height="160" viewBox="0 0 216 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<g filter="url(#filter0_d_4697_36713)">
<rect x="8.75" y="16.75" width="198.5" height="58.5" rx="3.25" stroke="#198038" stroke-width="1.5" shape-rendering="crispEdges"/>
<mask id="mask0_4697_36713" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="62" y="34" width="25" height="24">
<rect x="62.5" y="34" width="24" height="24" fill="#D9D9D9"/>
</mask>
<g mask="url(#mask0_4697_36713)">
<path d="M68.5 42H77.5V40C77.5 39.1667 77.2083 38.4583 76.625 37.875C76.0417 37.2917 75.3333 37 74.5 37C73.6667 37 72.9583 37.2917 72.375 37.875C71.7917 38.4583 71.5 39.1667 71.5 40H69.5C69.5 38.6167 69.9875 37.4375 70.9625 36.4625C71.9375 35.4875 73.1167 35 74.5 35C75.8833 35 77.0625 35.4875 78.0375 36.4625C79.0125 37.4375 79.5 38.6167 79.5 40V42H80.5C81.05 42 81.5208 42.1958 81.9125 42.5875C82.3042 42.9792 82.5 43.45 82.5 44V54C82.5 54.55 82.3042 55.0208 81.9125 55.4125C81.5208 55.8042 81.05 56 80.5 56H68.5C67.95 56 67.4792 55.8042 67.0875 55.4125C66.6958 55.0208 66.5 54.55 66.5 54V44C66.5 43.45 66.6958 42.9792 67.0875 42.5875C67.4792 42.1958 67.95 42 68.5 42ZM68.5 54H80.5V44H68.5V54ZM74.5 51C75.05 51 75.5208 50.8042 75.9125 50.4125C76.3042 50.0208 76.5 49.55 76.5 49C76.5 48.45 76.3042 47.9792 75.9125 47.5875C75.5208 47.1958 75.05 47 74.5 47C73.95 47 73.4792 47.1958 73.0875 47.5875C72.6958 47.9792 72.5 48.45 72.5 49C72.5 49.55 72.6958 50.0208 73.0875 50.4125C73.4792 50.8042 73.95 51 74.5 51Z" fill="#198038"/>
</g>
<path d="M102.131 45.25V45.9531C102.131 46.9199 102.005 47.7871 101.753 48.5547C101.501 49.3223 101.141 49.9756 100.672 50.5146C100.209 51.0537 99.6523 51.4668 99.002 51.7539C98.3516 52.0352 97.6309 52.1758 96.8398 52.1758C96.0547 52.1758 95.3369 52.0352 94.6865 51.7539C94.042 51.4668 93.4824 51.0537 93.0078 50.5146C92.5332 49.9756 92.1641 49.3223 91.9004 48.5547C91.6426 47.7871 91.5137 46.9199 91.5137 45.9531V45.25C91.5137 44.2832 91.6426 43.4189 91.9004 42.6572C92.1582 41.8896 92.5215 41.2363 92.9902 40.6973C93.4648 40.1523 94.0244 39.7393 94.6689 39.458C95.3193 39.1709 96.0371 39.0273 96.8223 39.0273C97.6133 39.0273 98.334 39.1709 98.9844 39.458C99.6348 39.7393 100.194 40.1523 100.663 40.6973C101.132 41.2363 101.492 41.8896 101.744 42.6572C102.002 43.4189 102.131 44.2832 102.131 45.25ZM99.9248 45.9531V45.2324C99.9248 44.5176 99.8545 43.8877 99.7139 43.3428C99.5791 42.792 99.377 42.332 99.1074 41.9629C98.8438 41.5879 98.5186 41.3066 98.1318 41.1191C97.7451 40.9258 97.3086 40.8291 96.8223 40.8291C96.3359 40.8291 95.9023 40.9258 95.5215 41.1191C95.1406 41.3066 94.8154 41.5879 94.5459 41.9629C94.2822 42.332 94.0801 42.792 93.9395 43.3428C93.7988 43.8877 93.7285 44.5176 93.7285 45.2324V45.9531C93.7285 46.668 93.7988 47.3008 93.9395 47.8516C94.0801 48.4023 94.2852 48.8682 94.5547 49.249C94.8301 49.624 95.1582 49.9082 95.5391 50.1016C95.9199 50.2891 96.3535 50.3828 96.8398 50.3828C97.332 50.3828 97.7686 50.2891 98.1494 50.1016C98.5303 49.9082 98.8525 49.624 99.1162 49.249C99.3799 48.8682 99.5791 48.4023 99.7139 47.8516C99.8545 47.3008 99.9248 46.668 99.9248 45.9531ZM106.403 44.3184V55.6562H104.285V42.4902H106.236L106.403 44.3184ZM112.599 47.1572V47.3418C112.599 48.0332 112.517 48.6748 112.353 49.2666C112.195 49.8525 111.958 50.3652 111.641 50.8047C111.331 51.2383 110.947 51.5752 110.49 51.8154C110.033 52.0557 109.505 52.1758 108.908 52.1758C108.316 52.1758 107.797 52.0674 107.352 51.8506C106.913 51.6279 106.541 51.3145 106.236 50.9102C105.931 50.5059 105.685 50.0312 105.498 49.4863C105.316 48.9355 105.187 48.332 105.111 47.6758V46.9639C105.187 46.2666 105.316 45.6338 105.498 45.0654C105.685 44.4971 105.931 44.0078 106.236 43.5977C106.541 43.1875 106.913 42.8711 107.352 42.6484C107.792 42.4258 108.304 42.3145 108.89 42.3145C109.488 42.3145 110.018 42.4316 110.481 42.666C110.944 42.8945 111.334 43.2227 111.65 43.6504C111.966 44.0723 112.204 44.582 112.362 45.1797C112.52 45.7715 112.599 46.4307 112.599 47.1572ZM110.481 47.3418V47.1572C110.481 46.7178 110.44 46.3105 110.358 45.9355C110.276 45.5547 110.147 45.2207 109.971 44.9336C109.796 44.6465 109.57 44.4238 109.295 44.2656C109.025 44.1016 108.7 44.0195 108.319 44.0195C107.944 44.0195 107.622 44.084 107.352 44.2129C107.083 44.3359 106.857 44.5088 106.675 44.7314C106.494 44.9541 106.353 45.2148 106.254 45.5137C106.154 45.8066 106.084 46.126 106.043 46.4717V48.1768C106.113 48.5986 106.233 48.9854 106.403 49.3369C106.573 49.6885 106.813 49.9697 107.124 50.1807C107.44 50.3857 107.844 50.4883 108.337 50.4883C108.717 50.4883 109.043 50.4062 109.312 50.2422C109.582 50.0781 109.801 49.8525 109.971 49.5654C110.147 49.2725 110.276 48.9355 110.358 48.5547C110.44 48.1738 110.481 47.7695 110.481 47.3418ZM118.743 52.1758C118.04 52.1758 117.404 52.0615 116.836 51.833C116.274 51.5986 115.793 51.2734 115.395 50.8574C115.002 50.4414 114.7 49.9521 114.489 49.3896C114.279 48.8271 114.173 48.2207 114.173 47.5703V47.2188C114.173 46.4746 114.281 45.8008 114.498 45.1973C114.715 44.5938 115.017 44.0781 115.404 43.6504C115.79 43.2168 116.247 42.8857 116.775 42.6572C117.302 42.4287 117.873 42.3145 118.488 42.3145C119.168 42.3145 119.763 42.4287 120.273 42.6572C120.782 42.8857 121.204 43.208 121.538 43.624C121.878 44.0342 122.13 44.5234 122.294 45.0918C122.464 45.6602 122.549 46.2871 122.549 46.9727V47.8779H115.201V46.3574H120.457V46.1904C120.446 45.8096 120.369 45.4521 120.229 45.1182C120.094 44.7842 119.886 44.5146 119.605 44.3096C119.323 44.1045 118.948 44.002 118.48 44.002C118.128 44.002 117.815 44.0781 117.539 44.2305C117.27 44.377 117.044 44.5908 116.862 44.8721C116.681 45.1533 116.54 45.4932 116.441 45.8916C116.347 46.2842 116.3 46.7266 116.3 47.2188V47.5703C116.3 47.9863 116.356 48.373 116.467 48.7305C116.584 49.082 116.754 49.3896 116.977 49.6533C117.199 49.917 117.469 50.125 117.785 50.2773C118.102 50.4238 118.462 50.4971 118.866 50.4971C119.376 50.4971 119.83 50.3945 120.229 50.1895C120.627 49.9844 120.973 49.6943 121.266 49.3193L122.382 50.4004C122.177 50.6992 121.91 50.9863 121.582 51.2617C121.254 51.5312 120.853 51.751 120.378 51.9209C119.909 52.0908 119.364 52.1758 118.743 52.1758ZM126.452 44.5205V52H124.334V42.4902H126.329L126.452 44.5205ZM126.074 46.8936L125.388 46.8848C125.394 46.2109 125.488 45.5928 125.67 45.0303C125.857 44.4678 126.115 43.9844 126.443 43.5801C126.777 43.1758 127.176 42.8652 127.638 42.6484C128.101 42.4258 128.617 42.3145 129.185 42.3145C129.642 42.3145 130.055 42.3789 130.425 42.5078C130.8 42.6309 131.119 42.833 131.383 43.1143C131.652 43.3955 131.857 43.7617 131.998 44.2129C132.138 44.6582 132.209 45.2061 132.209 45.8564V52H130.082V45.8477C130.082 45.3906 130.014 45.0303 129.88 44.7666C129.751 44.4971 129.56 44.3066 129.308 44.1953C129.062 44.0781 128.755 44.0195 128.386 44.0195C128.022 44.0195 127.697 44.0957 127.41 44.248C127.123 44.4004 126.88 44.6084 126.68 44.8721C126.487 45.1357 126.338 45.4404 126.232 45.7861C126.127 46.1318 126.074 46.501 126.074 46.8936ZM138.713 52.1758C138.01 52.1758 137.374 52.0615 136.806 51.833C136.244 51.5986 135.763 51.2734 135.365 50.8574C134.972 50.4414 134.67 49.9521 134.459 49.3896C134.248 48.8271 134.143 48.2207 134.143 47.5703V47.2188C134.143 46.4746 134.251 45.8008 134.468 45.1973C134.685 44.5938 134.987 44.0781 135.373 43.6504C135.76 43.2168 136.217 42.8857 136.745 42.6572C137.272 42.4287 137.843 42.3145 138.458 42.3145C139.138 42.3145 139.733 42.4287 140.243 42.6572C140.752 42.8857 141.174 43.208 141.508 43.624C141.848 44.0342 142.1 44.5234 142.264 45.0918C142.434 45.6602 142.519 46.2871 142.519 46.9727V47.8779H135.171V46.3574H140.427V46.1904C140.415 45.8096 140.339 45.4521 140.199 45.1182C140.064 44.7842 139.856 44.5146 139.575 44.3096C139.293 44.1045 138.918 44.002 138.45 44.002C138.098 44.002 137.785 44.0781 137.509 44.2305C137.24 44.377 137.014 44.5908 136.832 44.8721C136.651 45.1533 136.51 45.4932 136.411 45.8916C136.317 46.2842 136.27 46.7266 136.27 47.2188V47.5703C136.27 47.9863 136.326 48.373 136.437 48.7305C136.554 49.082 136.724 49.3896 136.947 49.6533C137.169 49.917 137.439 50.125 137.755 50.2773C138.072 50.4238 138.432 50.4971 138.836 50.4971C139.346 50.4971 139.8 50.3945 140.199 50.1895C140.597 49.9844 140.943 49.6943 141.236 49.3193L142.352 50.4004C142.147 50.6992 141.88 50.9863 141.552 51.2617C141.224 51.5312 140.823 51.751 140.348 51.9209C139.879 52.0908 139.334 52.1758 138.713 52.1758ZM150.122 50.0312V38.5H152.249V52H150.324L150.122 50.0312ZM143.935 47.3506V47.166C143.935 46.4453 144.02 45.7891 144.189 45.1973C144.359 44.5996 144.605 44.0869 144.928 43.6592C145.25 43.2256 145.643 42.8945 146.105 42.666C146.568 42.4316 147.09 42.3145 147.67 42.3145C148.244 42.3145 148.748 42.4258 149.182 42.6484C149.615 42.8711 149.984 43.1904 150.289 43.6064C150.594 44.0166 150.837 44.5088 151.019 45.083C151.2 45.6514 151.329 46.2842 151.405 46.9814V47.5703C151.329 48.25 151.2 48.8711 151.019 49.4336C150.837 49.9961 150.594 50.4824 150.289 50.8926C149.984 51.3027 149.612 51.6191 149.173 51.8418C148.739 52.0645 148.232 52.1758 147.652 52.1758C147.078 52.1758 146.56 52.0557 146.097 51.8154C145.64 51.5752 145.25 51.2383 144.928 50.8047C144.605 50.3711 144.359 49.8613 144.189 49.2754C144.02 48.6836 143.935 48.042 143.935 47.3506ZM146.053 47.166V47.3506C146.053 47.7842 146.091 48.1885 146.167 48.5635C146.249 48.9385 146.375 49.2695 146.545 49.5566C146.715 49.8379 146.935 50.0605 147.204 50.2246C147.479 50.3828 147.808 50.4619 148.188 50.4619C148.669 50.4619 149.064 50.3564 149.375 50.1455C149.686 49.9346 149.929 49.6504 150.104 49.293C150.286 48.9297 150.409 48.5254 150.474 48.0801V46.4893C150.438 46.1436 150.365 45.8213 150.254 45.5225C150.148 45.2236 150.005 44.9629 149.823 44.7402C149.642 44.5117 149.416 44.3359 149.146 44.2129C148.883 44.084 148.569 44.0195 148.206 44.0195C147.819 44.0195 147.491 44.1016 147.222 44.2656C146.952 44.4297 146.729 44.6553 146.554 44.9424C146.384 45.2295 146.258 45.5635 146.176 45.9443C146.094 46.3252 146.053 46.7324 146.053 47.166Z" fill="#198038"/>
</g>
<mask id="path-6-inside-1_4697_36713" fill="white">
<path d="M8 88C8 85.7909 9.79086 84 12 84H204C206.209 84 208 85.7909 208 88V140C208 142.209 206.209 144 204 144H12C9.79086 144 8 142.209 8 140V88Z"/>
</mask>
<path d="M8 88C8 85.7909 9.79086 84 12 84H204C206.209 84 208 85.7909 208 88V140C208 142.209 206.209 144 204 144H12C9.79086 144 8 142.209 8 140V88Z" fill="#D12730"/>
<path d="M8 84H208H8ZM208 140C208 143.314 205.314 146 202 146H14C10.6863 146 8 143.314 8 140C8 141.105 9.79086 142 12 142H204C206.209 142 208 141.105 208 140ZM8 144V84V144ZM208 84V144V84Z" fill="#D12730" mask="url(#path-6-inside-1_4697_36713)"/>
<mask id="mask1_4697_36713" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="65" y="102" width="25" height="24">
<rect x="65.5" y="102" width="24" height="24" fill="#D9D9D9"/>
</mask>
<g mask="url(#mask1_4697_36713)">
<path d="M71.5 124C70.95 124 70.4792 123.804 70.0875 123.413C69.6958 123.021 69.5 122.55 69.5 122V112C69.5 111.45 69.6958 110.979 70.0875 110.588C70.4792 110.196 70.95 110 71.5 110H72.5V108C72.5 106.617 72.9875 105.438 73.9625 104.462C74.9375 103.487 76.1167 103 77.5 103C78.8833 103 80.0625 103.487 81.0375 104.462C82.0125 105.438 82.5 106.617 82.5 108V110H83.5C84.05 110 84.5208 110.196 84.9125 110.588C85.3042 110.979 85.5 111.45 85.5 112V122C85.5 122.55 85.3042 123.021 84.9125 123.413C84.5208 123.804 84.05 124 83.5 124H71.5ZM71.5 122H83.5V112H71.5V122ZM77.5 119C78.05 119 78.5208 118.804 78.9125 118.413C79.3042 118.021 79.5 117.55 79.5 117C79.5 116.45 79.3042 115.979 78.9125 115.588C78.5208 115.196 78.05 115 77.5 115C76.95 115 76.4792 115.196 76.0875 115.588C75.6958 115.979 75.5 116.45 75.5 117C75.5 117.55 75.6958 118.021 76.0875 118.413C76.4792 118.804 76.95 119 77.5 119ZM74.5 110H80.5V108C80.5 107.167 80.2083 106.458 79.625 105.875C79.0417 105.292 78.3333 105 77.5 105C76.6667 105 75.9583 105.292 75.375 105.875C74.7917 106.458 74.5 107.167 74.5 108V110Z" fill="white"/>
</g>
<path d="M102.676 115.834H104.873C104.803 116.672 104.568 117.419 104.17 118.075C103.771 118.726 103.212 119.238 102.491 119.613C101.771 119.988 100.895 120.176 99.8633 120.176C99.0723 120.176 98.3604 120.035 97.7275 119.754C97.0947 119.467 96.5527 119.062 96.1016 118.541C95.6504 118.014 95.3047 117.378 95.0645 116.634C94.8301 115.89 94.7129 115.058 94.7129 114.138V113.074C94.7129 112.154 94.833 111.322 95.0732 110.578C95.3193 109.834 95.6709 109.198 96.1279 108.671C96.585 108.138 97.1328 107.73 97.7715 107.449C98.416 107.168 99.1396 107.027 99.9424 107.027C100.962 107.027 101.823 107.215 102.526 107.59C103.229 107.965 103.774 108.483 104.161 109.146C104.554 109.808 104.794 110.566 104.882 111.422H102.685C102.626 110.871 102.497 110.399 102.298 110.007C102.104 109.614 101.817 109.315 101.437 109.11C101.056 108.899 100.558 108.794 99.9424 108.794C99.4385 108.794 98.999 108.888 98.624 109.075C98.249 109.263 97.9355 109.538 97.6836 109.901C97.4316 110.265 97.2412 110.713 97.1123 111.246C96.9893 111.773 96.9277 112.377 96.9277 113.057V114.138C96.9277 114.782 96.9834 115.368 97.0947 115.896C97.2119 116.417 97.3877 116.865 97.6221 117.24C97.8623 117.615 98.167 117.905 98.5361 118.11C98.9053 118.315 99.3477 118.418 99.8633 118.418C100.49 118.418 100.997 118.318 101.384 118.119C101.776 117.92 102.072 117.63 102.271 117.249C102.477 116.862 102.611 116.391 102.676 115.834ZM109.084 106.5V120H106.957V106.5H109.084ZM111.15 115.351V115.148C111.15 114.463 111.249 113.827 111.448 113.241C111.648 112.649 111.935 112.137 112.31 111.703C112.691 111.264 113.154 110.924 113.698 110.684C114.249 110.438 114.87 110.314 115.562 110.314C116.259 110.314 116.88 110.438 117.425 110.684C117.976 110.924 118.442 111.264 118.822 111.703C119.203 112.137 119.493 112.649 119.693 113.241C119.892 113.827 119.991 114.463 119.991 115.148V115.351C119.991 116.036 119.892 116.672 119.693 117.258C119.493 117.844 119.203 118.356 118.822 118.796C118.442 119.229 117.979 119.569 117.434 119.815C116.889 120.056 116.271 120.176 115.579 120.176C114.882 120.176 114.258 120.056 113.707 119.815C113.162 119.569 112.699 119.229 112.319 118.796C111.938 118.356 111.648 117.844 111.448 117.258C111.249 116.672 111.15 116.036 111.15 115.351ZM113.268 115.148V115.351C113.268 115.778 113.312 116.183 113.4 116.563C113.487 116.944 113.625 117.278 113.813 117.565C114 117.853 114.24 118.078 114.533 118.242C114.826 118.406 115.175 118.488 115.579 118.488C115.972 118.488 116.312 118.406 116.599 118.242C116.892 118.078 117.132 117.853 117.32 117.565C117.507 117.278 117.645 116.944 117.733 116.563C117.826 116.183 117.873 115.778 117.873 115.351V115.148C117.873 114.727 117.826 114.328 117.733 113.953C117.645 113.572 117.504 113.235 117.311 112.942C117.123 112.649 116.883 112.421 116.59 112.257C116.303 112.087 115.96 112.002 115.562 112.002C115.163 112.002 114.818 112.087 114.525 112.257C114.237 112.421 114 112.649 113.813 112.942C113.625 113.235 113.487 113.572 113.4 113.953C113.312 114.328 113.268 114.727 113.268 115.148ZM127.252 117.425C127.252 117.214 127.199 117.023 127.094 116.854C126.988 116.678 126.786 116.52 126.487 116.379C126.194 116.238 125.761 116.109 125.186 115.992C124.682 115.881 124.22 115.749 123.798 115.597C123.382 115.438 123.024 115.248 122.725 115.025C122.427 114.803 122.195 114.539 122.031 114.234C121.867 113.93 121.785 113.578 121.785 113.18C121.785 112.793 121.87 112.427 122.04 112.081C122.21 111.735 122.453 111.431 122.769 111.167C123.086 110.903 123.47 110.695 123.921 110.543C124.378 110.391 124.888 110.314 125.45 110.314C126.247 110.314 126.929 110.449 127.498 110.719C128.072 110.982 128.512 111.343 128.816 111.8C129.121 112.251 129.273 112.761 129.273 113.329H127.155C127.155 113.077 127.091 112.843 126.962 112.626C126.839 112.403 126.651 112.225 126.399 112.09C126.147 111.949 125.831 111.879 125.45 111.879C125.087 111.879 124.785 111.938 124.545 112.055C124.31 112.166 124.135 112.312 124.017 112.494C123.906 112.676 123.85 112.875 123.85 113.092C123.85 113.25 123.88 113.394 123.938 113.522C124.003 113.646 124.108 113.76 124.255 113.865C124.401 113.965 124.6 114.059 124.852 114.146C125.11 114.234 125.432 114.319 125.819 114.401C126.546 114.554 127.17 114.75 127.691 114.99C128.219 115.225 128.623 115.529 128.904 115.904C129.185 116.273 129.326 116.742 129.326 117.311C129.326 117.732 129.235 118.119 129.054 118.471C128.878 118.816 128.62 119.118 128.28 119.376C127.94 119.628 127.533 119.824 127.058 119.965C126.59 120.105 126.062 120.176 125.476 120.176C124.615 120.176 123.886 120.023 123.288 119.719C122.69 119.408 122.236 119.013 121.926 118.532C121.621 118.046 121.469 117.542 121.469 117.021H123.516C123.54 117.413 123.648 117.727 123.842 117.961C124.041 118.189 124.287 118.356 124.58 118.462C124.879 118.562 125.186 118.611 125.503 118.611C125.884 118.611 126.203 118.562 126.461 118.462C126.719 118.356 126.915 118.216 127.05 118.04C127.184 117.858 127.252 117.653 127.252 117.425ZM135.523 120.176C134.82 120.176 134.184 120.062 133.616 119.833C133.053 119.599 132.573 119.273 132.174 118.857C131.782 118.441 131.48 117.952 131.269 117.39C131.058 116.827 130.953 116.221 130.953 115.57V115.219C130.953 114.475 131.061 113.801 131.278 113.197C131.495 112.594 131.796 112.078 132.183 111.65C132.57 111.217 133.027 110.886 133.554 110.657C134.081 110.429 134.653 110.314 135.268 110.314C135.948 110.314 136.542 110.429 137.052 110.657C137.562 110.886 137.984 111.208 138.318 111.624C138.658 112.034 138.91 112.523 139.074 113.092C139.244 113.66 139.329 114.287 139.329 114.973V115.878H131.981V114.357H137.237V114.19C137.225 113.81 137.149 113.452 137.008 113.118C136.873 112.784 136.665 112.515 136.384 112.31C136.103 112.104 135.728 112.002 135.259 112.002C134.908 112.002 134.594 112.078 134.319 112.23C134.049 112.377 133.824 112.591 133.642 112.872C133.46 113.153 133.32 113.493 133.22 113.892C133.126 114.284 133.079 114.727 133.079 115.219V115.57C133.079 115.986 133.135 116.373 133.246 116.73C133.364 117.082 133.534 117.39 133.756 117.653C133.979 117.917 134.248 118.125 134.565 118.277C134.881 118.424 135.242 118.497 135.646 118.497C136.156 118.497 136.61 118.395 137.008 118.189C137.407 117.984 137.752 117.694 138.045 117.319L139.162 118.4C138.956 118.699 138.69 118.986 138.362 119.262C138.034 119.531 137.632 119.751 137.158 119.921C136.689 120.091 136.144 120.176 135.523 120.176ZM146.932 118.031V106.5H149.059V120H147.134L146.932 118.031ZM140.744 115.351V115.166C140.744 114.445 140.829 113.789 140.999 113.197C141.169 112.6 141.415 112.087 141.737 111.659C142.06 111.226 142.452 110.895 142.915 110.666C143.378 110.432 143.899 110.314 144.479 110.314C145.054 110.314 145.558 110.426 145.991 110.648C146.425 110.871 146.794 111.19 147.099 111.606C147.403 112.017 147.646 112.509 147.828 113.083C148.01 113.651 148.139 114.284 148.215 114.981V115.57C148.139 116.25 148.01 116.871 147.828 117.434C147.646 117.996 147.403 118.482 147.099 118.893C146.794 119.303 146.422 119.619 145.982 119.842C145.549 120.064 145.042 120.176 144.462 120.176C143.888 120.176 143.369 120.056 142.906 119.815C142.449 119.575 142.06 119.238 141.737 118.805C141.415 118.371 141.169 117.861 140.999 117.275C140.829 116.684 140.744 116.042 140.744 115.351ZM142.862 115.166V115.351C142.862 115.784 142.9 116.188 142.977 116.563C143.059 116.938 143.185 117.27 143.354 117.557C143.524 117.838 143.744 118.061 144.014 118.225C144.289 118.383 144.617 118.462 144.998 118.462C145.479 118.462 145.874 118.356 146.185 118.146C146.495 117.935 146.738 117.65 146.914 117.293C147.096 116.93 147.219 116.525 147.283 116.08V114.489C147.248 114.144 147.175 113.821 147.063 113.522C146.958 113.224 146.814 112.963 146.633 112.74C146.451 112.512 146.226 112.336 145.956 112.213C145.692 112.084 145.379 112.02 145.016 112.02C144.629 112.02 144.301 112.102 144.031 112.266C143.762 112.43 143.539 112.655 143.363 112.942C143.193 113.229 143.067 113.563 142.985 113.944C142.903 114.325 142.862 114.732 142.862 115.166Z" fill="white"/>
<defs>
<filter id="filter0_d_4697_36713" x="0" y="12" width="216" height="76" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dy="4"/>
<feGaussianBlur stdDeviation="4"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.08 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4697_36713"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_4697_36713" result="shape"/>
</filter>
</defs>
</svg>
", + "description": "Sends the command to the device or updates attribute/time-series when the user toggles the button. Widget settings will enable you to configure behavior how to fetch the initial state and what to trigger when button checked/unchecked states.", + "descriptor": { + "type": "rpc", + "sizeX": 4, + "sizeY": 2, + "resources": [], + "templateHtml": "\n", + "templateCss": "", + "controllerScript": "self.onInit = function() {\n self.ctx.$scope.actionWidget.onInit();\n}\n\nself.typeParameters = function() {\n return {\n previewWidth: '300px',\n previewHeight: '150px',\n embedTitlePanel: true,\n displayRpcMessageToast: false\n };\n};\n\nself.onDestroy = function() {\n}\n", + "settingsSchema": "", + "dataKeySettingsSchema": "{}\n", + "settingsDirective": "tb-toggle-button-widget-settings", + "hasBasicMode": true, + "basicModeDirective": "tb-toggle-button-basic-config", + "defaultConfig": "{\"showTitle\":true,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{},\"title\":\"Door\",\"dropShadow\":true,\"enableFullscreen\":false,\"widgetStyle\":{},\"actions\":{},\"widgetCss\":\"\",\"noDataDisplayMessage\":\"\",\"titleFont\":{\"size\":16,\"sizeUnit\":\"px\",\"family\":\"Roboto\",\"weight\":\"500\",\"style\":null,\"lineHeight\":\"1.6\"},\"showTitleIcon\":false,\"titleTooltip\":\"\",\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"pageSize\":1024,\"titleIcon\":\"home\",\"iconColor\":\"rgba(0, 0, 0, 0.87)\",\"iconSize\":\"24px\",\"configMode\":\"basic\",\"targetDevice\":null,\"titleColor\":null,\"borderRadius\":null}" + }, + "tags": [ + "command", + "downlink", + "device configuration", + "device control", + "invocation", + "remote method", + "remote function", + "interface", + "subroutine call", + "inter-process communication", + "server request", + "toggle", + "button" + ] +} \ No newline at end of file diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts index 32a6a755b4..c4aaac2a9e 100644 --- a/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/basic-widget-config.module.ts @@ -104,6 +104,9 @@ import { PowerButtonBasicConfigComponent } from '@home/components/widget/config/basic/button/power-button-basic-config.component'; import { SliderBasicConfigComponent } from '@home/components/widget/config/basic/rpc/slider-basic-config.component'; +import { + ToggleButtonBasicConfigComponent +} from '@home/components/widget/config/basic/button/toggle-button-basic-config.component'; @NgModule({ declarations: [ @@ -137,7 +140,8 @@ import { SliderBasicConfigComponent } from '@home/components/widget/config/basic ActionButtonBasicConfigComponent, CommandButtonBasicConfigComponent, PowerButtonBasicConfigComponent, - SliderBasicConfigComponent + SliderBasicConfigComponent, + ToggleButtonBasicConfigComponent ], imports: [ CommonModule, @@ -175,7 +179,8 @@ import { SliderBasicConfigComponent } from '@home/components/widget/config/basic ActionButtonBasicConfigComponent, CommandButtonBasicConfigComponent, PowerButtonBasicConfigComponent, - SliderBasicConfigComponent + SliderBasicConfigComponent, + ToggleButtonBasicConfigComponent ] }) export class BasicWidgetConfigModule { @@ -207,5 +212,6 @@ export const basicWidgetConfigComponentsMap: {[key: string]: Type
widgets.power-button.power-on
+ + +
+
widgets.toggle-button.behavior
+
+
widgets.rpc-state.initial-state
+ +
+
+
widgets.toggle-button.check
+ +
+
+
widgets.toggle-button.uncheck
+ +
+
+
widgets.rpc-state.disabled-state
+ +
+
+
+
widget-config.appearance
+
+ + + + + {{ 'widgets.toggle-button.auto-scale' | translate }} + + + + +
+ + {{ 'widgets.toggle-button.horizontal-fill' | translate }} + +
+
+ + {{ 'widgets.toggle-button.vertical-fill' | translate }} + +
+ + +
+
+ + {{ 'widget-config.title' | translate }} + +
+ + + + + + + +
+
+
+ + {{ 'widget-config.card-icon' | translate }} + +
+ + + + + + + + +
+
+
+
+
+
widgets.toggle-button.button-appearance
+ + {{ 'widgets.toggle-button.checked' | translate }} + {{ 'widgets.toggle-button.unchecked' | translate }} + +
+ + + + +
+
+
widget-config.card-appearance
+
+
{{ 'widgets.background.background' | translate }}
+ + +
+
+
widget-config.show-card-buttons
+ + {{ 'fullscreen.fullscreen' | translate }} + +
+
+
{{ 'widget-config.card-border-radius' | translate }}
+ + + +
+
+ + + diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/button/toggle-button-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/button/toggle-button-basic-config.component.ts new file mode 100644 index 0000000000..e93a3a9e38 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/button/toggle-button-basic-config.component.ts @@ -0,0 +1,192 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { Component } from '@angular/core'; +import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { BasicWidgetConfigComponent } from '@home/components/widget/config/widget-config.component.models'; +import { WidgetConfigComponentData } from '@home/models/widget-component.models'; +import { TargetDevice, TargetDeviceType, WidgetConfig, } from '@shared/models/widget.models'; +import { WidgetConfigComponent } from '@home/components/widget/widget-config.component'; +import { isUndefined } from '@core/utils'; +import { ValueType } from '@shared/models/constants'; +import { cssSizeToStrSize, resolveCssSize } from '@shared/models/widget-settings.models'; +import { + toggleButtonDefaultSettings, + ToggleButtonWidgetSettings +} from '@home/components/widget/lib/button/toggle-button-widget.models'; + +type ButtonAppearanceType = 'checked' | 'unchecked'; + +@Component({ + selector: 'tb-toggle-button-basic-config', + templateUrl: './toggle-button-basic-config.component.html', + styleUrls: ['../basic-config.scss'] +}) +export class ToggleButtonBasicConfigComponent extends BasicWidgetConfigComponent { + + get targetDevice(): TargetDevice { + return this.toggleButtonWidgetConfigForm.get('targetDevice').value; + } + + valueType = ValueType; + + buttonAppearanceType: ButtonAppearanceType = 'checked'; + + toggleButtonWidgetConfigForm: UntypedFormGroup; + + constructor(protected store: Store, + protected widgetConfigComponent: WidgetConfigComponent, + private fb: UntypedFormBuilder) { + super(store, widgetConfigComponent); + } + + protected configForm(): UntypedFormGroup { + return this.toggleButtonWidgetConfigForm; + } + + protected onConfigSet(configData: WidgetConfigComponentData) { + const settings: ToggleButtonWidgetSettings = {...toggleButtonDefaultSettings, ...(configData.config.settings || {})}; + const iconSize = resolveCssSize(configData.config.iconSize); + this.toggleButtonWidgetConfigForm = this.fb.group({ + targetDevice: [configData.config.targetDevice, []], + + initialState: [settings.initialState, []], + checkState: [settings.checkState, []], + uncheckState: [settings.uncheckState, []], + disabledState: [settings.disabledState, []], + + showTitle: [configData.config.showTitle, []], + title: [configData.config.title, []], + titleFont: [configData.config.titleFont, []], + titleColor: [configData.config.titleColor, []], + + showIcon: [configData.config.showTitleIcon, []], + iconSize: [iconSize[0], [Validators.min(0)]], + iconSizeUnit: [iconSize[1], []], + icon: [configData.config.titleIcon, []], + iconColor: [configData.config.iconColor, []], + + autoScale: [settings.autoScale, []], + horizontalFill: [settings.horizontalFill, []], + verticalFill: [settings.verticalFill, []], + + checkedAppearance: [settings.checkedAppearance, []], + uncheckedAppearance: [settings.uncheckedAppearance, []], + + background: [settings.background, []], + + cardButtons: [this.getCardButtons(configData.config), []], + borderRadius: [configData.config.borderRadius, []], + + actions: [configData.config.actions || {}, []] + }); + } + + protected prepareOutputConfig(config: any): WidgetConfigComponentData { + this.widgetConfig.config.targetDevice = config.targetDevice; + + this.widgetConfig.config.showTitle = config.showTitle; + this.widgetConfig.config.title = config.title; + this.widgetConfig.config.titleFont = config.titleFont; + this.widgetConfig.config.titleColor = config.titleColor; + + this.widgetConfig.config.showTitleIcon = config.showIcon; + this.widgetConfig.config.iconSize = cssSizeToStrSize(config.iconSize, config.iconSizeUnit); + this.widgetConfig.config.titleIcon = config.icon; + this.widgetConfig.config.iconColor = config.iconColor; + + this.widgetConfig.config.settings = this.widgetConfig.config.settings || {}; + + this.widgetConfig.config.settings.initialState = config.initialState; + this.widgetConfig.config.settings.checkState = config.checkState; + this.widgetConfig.config.settings.uncheckState = config.uncheckState; + this.widgetConfig.config.settings.disabledState = config.disabledState; + + this.widgetConfig.config.settings.autoScale = config.autoScale; + this.widgetConfig.config.settings.horizontalFill = config.horizontalFill; + this.widgetConfig.config.settings.verticalFill = config.verticalFill; + + this.widgetConfig.config.settings.checkedAppearance = config.checkedAppearance; + this.widgetConfig.config.settings.uncheckedAppearance = config.uncheckedAppearance; + + this.widgetConfig.config.settings.background = config.background; + + this.setCardButtons(config.cardButtons, this.widgetConfig.config); + this.widgetConfig.config.borderRadius = config.borderRadius; + + this.widgetConfig.config.actions = config.actions; + return this.widgetConfig; + } + + protected validatorTriggers(): string[] { + return ['showTitle', 'showIcon', 'autoScale']; + } + + protected updateValidators(emitEvent: boolean, trigger?: string) { + const showTitle: boolean = this.toggleButtonWidgetConfigForm.get('showTitle').value; + const showIcon: boolean = this.toggleButtonWidgetConfigForm.get('showIcon').value; + const autoScale: boolean = this.toggleButtonWidgetConfigForm.get('autoScale').value; + if (showTitle) { + this.toggleButtonWidgetConfigForm.get('title').enable(); + this.toggleButtonWidgetConfigForm.get('titleFont').enable(); + this.toggleButtonWidgetConfigForm.get('titleColor').enable(); + this.toggleButtonWidgetConfigForm.get('showIcon').enable({emitEvent: false}); + if (showIcon) { + this.toggleButtonWidgetConfigForm.get('iconSize').enable(); + this.toggleButtonWidgetConfigForm.get('iconSizeUnit').enable(); + this.toggleButtonWidgetConfigForm.get('icon').enable(); + this.toggleButtonWidgetConfigForm.get('iconColor').enable(); + } else { + this.toggleButtonWidgetConfigForm.get('iconSize').disable(); + this.toggleButtonWidgetConfigForm.get('iconSizeUnit').disable(); + this.toggleButtonWidgetConfigForm.get('icon').disable(); + this.toggleButtonWidgetConfigForm.get('iconColor').disable(); + } + } else { + this.toggleButtonWidgetConfigForm.get('title').disable(); + this.toggleButtonWidgetConfigForm.get('titleFont').disable(); + this.toggleButtonWidgetConfigForm.get('titleColor').disable(); + this.toggleButtonWidgetConfigForm.get('showIcon').disable({emitEvent: false}); + this.toggleButtonWidgetConfigForm.get('iconSize').disable(); + this.toggleButtonWidgetConfigForm.get('iconSizeUnit').disable(); + this.toggleButtonWidgetConfigForm.get('icon').disable(); + this.toggleButtonWidgetConfigForm.get('iconColor').disable(); + } + if (autoScale) { + this.toggleButtonWidgetConfigForm.get('horizontalFill').disable(); + this.toggleButtonWidgetConfigForm.get('verticalFill').disable(); + } else { + this.toggleButtonWidgetConfigForm.get('horizontalFill').enable(); + this.toggleButtonWidgetConfigForm.get('verticalFill').enable(); + } + } + + private getCardButtons(config: WidgetConfig): string[] { + const buttons: string[] = []; + if (isUndefined(config.enableFullscreen) || config.enableFullscreen) { + buttons.push('fullscreen'); + } + return buttons; + } + + private setCardButtons(buttons: string[], config: WidgetConfig) { + config.enableFullscreen = buttons.includes('fullscreen'); + } + + protected readonly TargetDeviceType = TargetDeviceType; +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/button/toggle-button-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/button/toggle-button-widget.component.html new file mode 100644 index 0000000000..366b7d3290 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/button/toggle-button-widget.component.html @@ -0,0 +1,34 @@ + +
+
+ +
+ + +
+ +
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/button/toggle-button-widget.component.scss b/ui-ngx/src/app/modules/home/components/widget/lib/button/toggle-button-widget.component.scss new file mode 100644 index 0000000000..07cc8599e2 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/button/toggle-button-widget.component.scss @@ -0,0 +1,70 @@ +/** + * Copyright © 2016-2024 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +.tb-toggle-button-panel { + width: 100%; + height: 100%; + position: relative; + display: flex; + flex-direction: column; + gap: 8px; + padding: 20px 24px 24px 24px; + + > div:not(.tb-toggle-button-overlay) { + z-index: 1; + } + + .tb-toggle-button-overlay { + position: absolute; + top: 12px; + left: 12px; + bottom: 12px; + right: 12px; + } + + div.tb-widget-title { + padding: 0; + } + + .tb-toggle-button-container { + flex: 1; + min-width: 0; + min-height: 0; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + &.auto-scale { + tb-widget-button { + flex: 1; + min-width: 0; + min-height: 0; + width: 100%; + height: 100%; + } + } + &.horizontal-fill { + tb-widget-button { + width: 100%; + } + } + &.vertical-fill { + tb-widget-button { + height: 100%; + } + } + } + +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/button/toggle-button-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/button/toggle-button-widget.component.ts new file mode 100644 index 0000000000..b6943775a7 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/button/toggle-button-widget.component.ts @@ -0,0 +1,142 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { AfterViewInit, ChangeDetectorRef, Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core'; +import { BasicActionWidgetComponent, ValueSetter } from '@home/components/widget/lib/action/action-widget.models'; +import { ImagePipe } from '@shared/pipe/image.pipe'; +import { DomSanitizer } from '@angular/platform-browser'; +import { ValueType } from '@shared/models/constants'; +import { WidgetButtonAppearance } from '@shared/components/button/widget-button.models'; +import { + toggleButtonDefaultSettings, + ToggleButtonWidgetSettings +} from '@home/components/widget/lib/button/toggle-button-widget.models'; +import { Observable } from 'rxjs'; +import { backgroundStyle, ComponentStyle, overlayStyle } from '@shared/models/widget-settings.models'; + +@Component({ + selector: 'tb-toggle-button-widget', + templateUrl: './toggle-button-widget.component.html', + styleUrls: ['../action/action-widget.scss', './toggle-button-widget.component.scss'], + encapsulation: ViewEncapsulation.None +}) +export class ToggleButtonWidgetComponent extends + BasicActionWidgetComponent implements OnInit, AfterViewInit, OnDestroy { + + settings: ToggleButtonWidgetSettings; + + backgroundStyle$: Observable; + overlayStyle: ComponentStyle = {}; + + value = false; + disabled = false; + + autoScale: boolean; + horizontalFill: boolean; + verticalFill: boolean; + appearance: WidgetButtonAppearance; + + private checkValueSetter: ValueSetter; + private uncheckValueSetter: ValueSetter; + + constructor(protected imagePipe: ImagePipe, + protected sanitizer: DomSanitizer, + protected cd: ChangeDetectorRef) { + super(cd); + } + + ngOnInit(): void { + super.ngOnInit(); + this.settings = {...toggleButtonDefaultSettings, ...this.ctx.settings}; + + this.autoScale = this.settings.autoScale; + this.horizontalFill = this.settings.horizontalFill; + this.verticalFill = this.settings.verticalFill; + + this.backgroundStyle$ = backgroundStyle(this.settings.background, this.imagePipe, this.sanitizer); + this.overlayStyle = overlayStyle(this.settings.background.overlay); + + const getInitialStateSettings = + {...this.settings.initialState, actionLabel: this.ctx.translate.instant('widgets.rpc-state.initial-state')}; + this.createValueGetter(getInitialStateSettings, ValueType.BOOLEAN, { + next: (value) => this.onValue(value) + }); + + const disabledStateSettings = + {...this.settings.disabledState, actionLabel: this.ctx.translate.instant('widgets.button-state.disabled-state')}; + this.createValueGetter(disabledStateSettings, ValueType.BOOLEAN, { + next: (value) => this.onDisabled(value) + }); + + const checkStateSettings = {...this.settings.checkState, + actionLabel: this.ctx.translate.instant('widgets.toggle-button.check')}; + this.checkValueSetter = this.createValueSetter(checkStateSettings); + + const uncheckStateSettings = {...this.settings.uncheckState, + actionLabel: this.ctx.translate.instant('widgets.toggle-button.uncheck')}; + this.uncheckValueSetter = this.createValueSetter(uncheckStateSettings); + + this.appearance = this.value ? this.settings.checkedAppearance : this.settings.uncheckedAppearance; + } + + ngAfterViewInit(): void { + super.ngAfterViewInit(); + } + + ngOnDestroy() { + super.ngOnDestroy(); + } + + public onInit() { + super.onInit(); + const borderRadius = this.ctx.$widgetElement.css('borderRadius'); + this.overlayStyle = {...this.overlayStyle, ...{borderRadius}}; + this.cd.detectChanges(); + } + + private onValue(value: boolean): void { + const newValue = !!value; + if (this.value !== newValue) { + this.value = newValue; + this.appearance = this.value ? this.settings.checkedAppearance : this.settings.uncheckedAppearance; + this.cd.markForCheck(); + } + } + + private onDisabled(value: boolean): void { + const newDisabled = !!value; + if (this.disabled !== newDisabled) { + this.disabled = newDisabled; + this.cd.markForCheck(); + } + } + + public onClick(_$event: MouseEvent) { + if (!this.ctx.isEdit && !this.ctx.isPreview) { + this.onValue(!this.value); + const targetValue = this.value; + const targetSetter = targetValue ? this.checkValueSetter : this.uncheckValueSetter; + this.updateValue(targetSetter, targetValue, { + next: () => { + this.onValue(targetValue); + }, + error: () => { + this.onValue(!targetValue); + } + }); + } + } +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/button/toggle-button-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/button/toggle-button-widget.models.ts new file mode 100644 index 0000000000..8307a09bd3 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/button/toggle-button-widget.models.ts @@ -0,0 +1,143 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { + WidgetButtonAppearance, + widgetButtonDefaultAppearance, + WidgetButtonType +} from '@shared/components/button/widget-button.models'; +import { + DataToValueType, + GetValueAction, + GetValueSettings, + SetValueAction, + SetValueSettings, + ValueToDataType +} from '@shared/models/action-widget-settings.models'; +import { BackgroundSettings, BackgroundType } from '@shared/models/widget-settings.models'; +import { AttributeScope } from '@shared/models/telemetry/telemetry.models'; + +export interface ToggleButtonWidgetSettings { + initialState: GetValueSettings; + disabledState: GetValueSettings; + checkState: SetValueSettings; + uncheckState: SetValueSettings; + autoScale: boolean; + horizontalFill: boolean; + verticalFill: boolean; + checkedAppearance: WidgetButtonAppearance; + uncheckedAppearance: WidgetButtonAppearance; + background: BackgroundSettings; +} + +export const toggleButtonDefaultSettings: ToggleButtonWidgetSettings = { + initialState: { + action: GetValueAction.EXECUTE_RPC, + defaultValue: false, + executeRpc: { + method: 'getState', + requestTimeout: 5000, + requestPersistent: false, + persistentPollingInterval: 1000 + }, + getAttribute: { + key: 'state', + scope: null + }, + getTimeSeries: { + key: 'state' + }, + dataToValue: { + type: DataToValueType.NONE, + compareToValue: true, + dataToValueFunction: '/* Should return boolean value */\nreturn data;' + } + }, + disabledState: { + action: GetValueAction.DO_NOTHING, + defaultValue: false, + getAttribute: { + key: 'state', + scope: null + }, + getTimeSeries: { + key: 'state' + }, + dataToValue: { + type: DataToValueType.NONE, + compareToValue: true, + dataToValueFunction: '/* Should return boolean value */\nreturn data;' + } + }, + checkState: { + action: SetValueAction.EXECUTE_RPC, + executeRpc: { + method: 'setState', + requestTimeout: 5000, + requestPersistent: false, + persistentPollingInterval: 1000 + }, + setAttribute: { + key: 'state', + scope: AttributeScope.SHARED_SCOPE + }, + putTimeSeries: { + key: 'state' + }, + valueToData: { + type: ValueToDataType.CONSTANT, + constantValue: true, + valueToDataFunction: '/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;' + } + }, + uncheckState: { + action: SetValueAction.EXECUTE_RPC, + executeRpc: { + method: 'setState', + requestTimeout: 5000, + requestPersistent: false, + persistentPollingInterval: 1000 + }, + setAttribute: { + key: 'state', + scope: AttributeScope.SHARED_SCOPE + }, + putTimeSeries: { + key: 'state' + }, + valueToData: { + type: ValueToDataType.CONSTANT, + constantValue: false, + valueToDataFunction: '/* Convert input boolean value to RPC parameters or attribute/time-series value */ \n return value;' + } + }, + autoScale: true, + horizontalFill: true, + verticalFill: false, + checkedAppearance: {...widgetButtonDefaultAppearance, + type: WidgetButtonType.outlined, mainColor: '#198038', label: 'Opened', icon: 'mdi:lock-open-variant', borderRadius: '4px'}, + uncheckedAppearance: {...widgetButtonDefaultAppearance, + type: WidgetButtonType.filled, mainColor: '#D12730', label: 'Closed', icon: 'lock', borderRadius: '4px'}, + background: { + type: BackgroundType.color, + color: '#fff', + overlay: { + enabled: false, + color: 'rgba(255,255,255,0.72)', + blur: 3 + } + } +}; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/toggle-button-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/toggle-button-widget-settings.component.html new file mode 100644 index 0000000000..3a7e5865c1 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/toggle-button-widget-settings.component.html @@ -0,0 +1,119 @@ + + +
+
widgets.toggle-button.behavior
+
+
widgets.rpc-state.initial-state
+ +
+
+
widgets.toggle-button.check
+ +
+
+
widgets.toggle-button.uncheck
+ +
+
+
widgets.rpc-state.disabled-state
+ +
+
+
+
widget-config.appearance
+
+ + + + + {{ 'widgets.toggle-button.auto-scale' | translate }} + + + + +
+ + {{ 'widgets.toggle-button.horizontal-fill' | translate }} + +
+
+ + {{ 'widgets.toggle-button.vertical-fill' | translate }} + +
+ + +
+
+
{{ 'widgets.background.background' | translate }}
+ + +
+
+
+
+
widgets.toggle-button.button-appearance
+ + {{ 'widgets.toggle-button.checked' | translate }} + {{ 'widgets.toggle-button.unchecked' | translate }} + +
+ + + + +
+ diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/toggle-button-widget-settings.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/toggle-button-widget-settings.component.ts new file mode 100644 index 0000000000..04788e3a14 --- /dev/null +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/button/toggle-button-widget-settings.component.ts @@ -0,0 +1,94 @@ +/// +/// Copyright © 2016-2024 The Thingsboard Authors +/// +/// Licensed under the Apache License, Version 2.0 (the "License"); +/// you may not use this file except in compliance with the License. +/// You may obtain a copy of the License at +/// +/// http://www.apache.org/licenses/LICENSE-2.0 +/// +/// Unless required by applicable law or agreed to in writing, software +/// distributed under the License is distributed on an "AS IS" BASIS, +/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +/// See the License for the specific language governing permissions and +/// limitations under the License. +/// + +import { Component } from '@angular/core'; +import { TargetDevice, WidgetSettings, WidgetSettingsComponent, widgetType } from '@shared/models/widget.models'; +import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; +import { Store } from '@ngrx/store'; +import { AppState } from '@core/core.state'; +import { ValueType } from '@shared/models/constants'; +import { toggleButtonDefaultSettings } from '@home/components/widget/lib/button/toggle-button-widget.models'; + +type ButtonAppearanceType = 'checked' | 'unchecked'; + +@Component({ + selector: 'tb-toggle-button-widget-settings', + templateUrl: './toggle-button-widget-settings.component.html', + styleUrls: ['./../widget-settings.scss'] +}) +export class ToggleButtonWidgetSettingsComponent extends WidgetSettingsComponent { + + get targetDevice(): TargetDevice { + return this.widgetConfig?.config?.targetDevice; + } + + get widgetType(): widgetType { + return this.widgetConfig?.widgetType; + } + + valueType = ValueType; + + buttonAppearanceType: ButtonAppearanceType = 'checked'; + + toggleButtonWidgetSettingsForm: UntypedFormGroup; + + constructor(protected store: Store, + private fb: UntypedFormBuilder) { + super(store); + } + + protected settingsForm(): UntypedFormGroup { + return this.toggleButtonWidgetSettingsForm; + } + + protected defaultSettings(): WidgetSettings { + return {...toggleButtonDefaultSettings}; + } + + protected onSettingsSet(settings: WidgetSettings) { + this.toggleButtonWidgetSettingsForm = this.fb.group({ + initialState: [settings.initialState, []], + checkState: [settings.checkState, []], + uncheckState: [settings.uncheckState, []], + disabledState: [settings.disabledState, []], + + autoScale: [settings.autoScale, []], + horizontalFill: [settings.horizontalFill, []], + verticalFill: [settings.verticalFill, []], + + checkedAppearance: [settings.checkedAppearance, []], + uncheckedAppearance: [settings.uncheckedAppearance, []], + + background: [settings.background, []] + }); + } + + protected validatorTriggers(): string[] { + return ['autoScale']; + } + + protected updateValidators(emitEvent: boolean) { + const autoScale: boolean = this.toggleButtonWidgetSettingsForm.get('autoScale').value; + + if (autoScale) { + this.toggleButtonWidgetSettingsForm.get('horizontalFill').disable(); + this.toggleButtonWidgetSettingsForm.get('verticalFill').disable(); + } else { + this.toggleButtonWidgetSettingsForm.get('horizontalFill').enable(); + this.toggleButtonWidgetSettingsForm.get('verticalFill').enable(); + } + } +} diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html index 4cf5857612..4fc8f1fdce 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/action/set-value-action-settings-panel.component.html @@ -97,7 +97,7 @@
{{ (setValueSettingsFormGroup.get('action').value === setValueAction.EXECUTE_RPC ? 'widgets.value-action.parameters' : 'widgets.value-action.value') | translate }}
- {{ 'widgets.value-action.converter-value' | translate }} + {{ 'widgets.value-action.converter-value' | translate }} {{ 'widgets.value-action.converter-constant' | translate }} {{ 'widgets.value-action.converter-function' | translate }} -
+
{{ 'widgets.button.auto-scale' | translate }} @@ -56,6 +56,10 @@
+
+
{{ 'widgets.button.border-radius' | translate }}
+ +
{{ 'widgets.button.color-palette' | translate }}
@@ -88,6 +92,7 @@ [state]="state" [appearance]="this.appearanceFormGroup.value" [borderRadius]="borderRadius" + [autoScale]="autoScale" [formControlName]="state">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.ts index d8756e3e31..f9afc0b5d1 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-appearance.component.ts @@ -24,6 +24,7 @@ import { widgetButtonTypeTranslations } from '@shared/components/button/widget-button.models'; import { merge } from 'rxjs'; +import { coerceBoolean } from '@shared/decorators/coercion'; @Component({ selector: 'tb-widget-button-appearance', @@ -46,6 +47,17 @@ export class WidgetButtonAppearanceComponent implements OnInit, ControlValueAcce @Input() borderRadius: string; + @Input() + autoScale: boolean; + + @Input() + @coerceBoolean() + withAutoScale = true; + + @Input() + @coerceBoolean() + withBorderRadius = false; + widgetButtonTypes = widgetButtonTypes; widgetButtonTypeTranslationMap = widgetButtonTypeTranslations; @@ -65,7 +77,6 @@ export class WidgetButtonAppearanceComponent implements OnInit, ControlValueAcce ngOnInit(): void { this.appearanceFormGroup = this.fb.group({ type: [null, []], - autoScale: [null, []], showLabel: [null, []], label: [null, []], showIcon: [null, []], @@ -75,6 +86,12 @@ export class WidgetButtonAppearanceComponent implements OnInit, ControlValueAcce mainColor: [null, []], backgroundColor: [null, []] }); + if (this.withAutoScale) { + this.appearanceFormGroup.addControl('autoScale', this.fb.control(null, [])); + } + if (this.withBorderRadius) { + this.appearanceFormGroup.addControl('borderRadius', this.fb.control(null, [])); + } const customStyle = this.fb.group({}); for (const state of widgetButtonStates) { customStyle.addControl(state, this.fb.control(null, [])); diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-custom-style-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-custom-style-panel.component.html index e5750fd4bb..86b5acde6e 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-custom-style-panel.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-custom-style-panel.component.html @@ -51,6 +51,7 @@ #widgetButtonPreview [appearance]="previewAppearance" [borderRadius]="borderRadius" + [autoScale]="autoScale" disableEvents [hovered]="state === widgetButtonState.hovered" [pressed]="state === widgetButtonState.pressed" diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-custom-style-panel.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-custom-style-panel.component.ts index cab7ab8b00..5bb043b9d8 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-custom-style-panel.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-custom-style-panel.component.ts @@ -61,6 +61,9 @@ export class WidgetButtonCustomStylePanelComponent extends PageComponent impleme @Input() borderRadius: string; + @Input() + autoScale: boolean; + @Input() state: WidgetButtonState; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-custom-style.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-custom-style.component.html index 3b78af6d5d..dd2f43afa9 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-custom-style.component.html +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/button/widget-button-custom-style.component.html @@ -20,6 +20,7 @@
- + - +
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/css-size-input.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/css-size-input.component.ts index dcd579e071..099778e924 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/css-size-input.component.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/css-size-input.component.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import { Component, forwardRef, Input, OnInit } from '@angular/core'; +import { Component, forwardRef, HostBinding, Input, OnInit } from '@angular/core'; import { ControlValueAccessor, NG_VALIDATORS, @@ -48,6 +48,16 @@ import { isDefinedAndNotNull } from '@core/utils'; }) export class CssSizeInputComponent implements OnInit, ControlValueAccessor, Validator { + @HostBinding('style.width') + get hostWidth(): string { + return this.flex ? '100%' : null; + } + + @HostBinding('style.flex') + get hostFlex(): string { + return this.flex ? '1' : null; + } + @Input() disabled: boolean; @@ -62,6 +72,10 @@ export class CssSizeInputComponent implements OnInit, ControlValueAccessor, Vali @coerceBoolean() allowEmptyUnit = false; + @Input() + @coerceBoolean() + flex = false; + cssSizeFormGroup: UntypedFormGroup; modelValue: string; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts index 8fc6ef96c2..2943b4cc09 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts @@ -327,6 +327,9 @@ import { import { SliderWidgetSettingsComponent } from '@home/components/widget/lib/settings/control/slider-widget-settings.component'; +import { + ToggleButtonWidgetSettingsComponent +} from '@home/components/widget/lib/settings/button/toggle-button-widget-settings.component'; @NgModule({ declarations: [ @@ -444,7 +447,8 @@ import { ActionButtonWidgetSettingsComponent, CommandButtonWidgetSettingsComponent, PowerButtonWidgetSettingsComponent, - SliderWidgetSettingsComponent + SliderWidgetSettingsComponent, + ToggleButtonWidgetSettingsComponent ], imports: [ CommonModule, @@ -567,7 +571,8 @@ import { ActionButtonWidgetSettingsComponent, CommandButtonWidgetSettingsComponent, PowerButtonWidgetSettingsComponent, - SliderWidgetSettingsComponent + SliderWidgetSettingsComponent, + ToggleButtonWidgetSettingsComponent ] }) export class WidgetSettingsModule { @@ -657,5 +662,6 @@ export const widgetSettingsComponentsMap: {[key: string]: Type
{{ appearance.icon }} diff --git a/ui-ngx/src/app/shared/components/button/widget-button.component.scss b/ui-ngx/src/app/shared/components/button/widget-button.component.scss index a0abc95731..157f6b179a 100644 --- a/ui-ngx/src/app/shared/components/button/widget-button.component.scss +++ b/ui-ngx/src/app/shared/components/button/widget-button.component.scss @@ -70,7 +70,11 @@ $boxShadowColorDisabled: var(--tb-widget-button-box-shadow-color-disabled, $defa .mat-mdc-button.mat-mdc-button-base.tb-widget-button { width: 100%; height: 100%; + min-width: 0; padding: 8px 12px; + &.tb-icon-only { + padding: 8px; + } .mdc-button__label { width: 100%; height: 100%; diff --git a/ui-ngx/src/app/shared/components/button/widget-button.component.ts b/ui-ngx/src/app/shared/components/button/widget-button.component.ts index 059f263196..db6584d96f 100644 --- a/ui-ngx/src/app/shared/components/button/widget-button.component.ts +++ b/ui-ngx/src/app/shared/components/button/widget-button.component.ts @@ -34,11 +34,12 @@ import { widgetButtonDefaultAppearance } from '@shared/components/button/widget-button.models'; import { coerceBoolean } from '@shared/decorators/coercion'; -import { ComponentStyle, iconStyle } from '@shared/models/widget-settings.models'; +import { ComponentStyle, iconStyle, validateCssSize } from '@shared/models/widget-settings.models'; import { UtilsService } from '@core/services/utils.service'; import { ResizeObserver } from '@juggle/resize-observer'; import { Observable, of } from 'rxjs'; import { WidgetContext } from '@home/models/widget-component.models'; +import { isDefinedAndNotNull, isNotEmptyStr } from '@core/utils'; const initialButtonHeight = 60; const horizontalLayoutPadding = 24; @@ -64,6 +65,9 @@ export class WidgetButtonComponent implements OnInit, AfterViewInit, OnDestroy, @Input() borderRadius = '4px'; + @Input() + autoScale: boolean; + @Input() @coerceBoolean() disabled = false; @@ -94,6 +98,8 @@ export class WidgetButtonComponent implements OnInit, AfterViewInit, OnDestroy, iconStyle: ComponentStyle = {}; + computedBorderRadius: string; + mousePressed = false; private buttonResize$: ResizeObserver; @@ -114,6 +120,10 @@ export class WidgetButtonComponent implements OnInit, AfterViewInit, OnDestroy, if (!change.firstChange) { if (propName === 'appearance') { this.updateAppearance(); + } else if (propName === 'borderRadius') { + this.updateBorderRadius(); + } else if (propName === 'autoScale') { + this.updateAutoScale(); } } } @@ -144,12 +154,22 @@ export class WidgetButtonComponent implements OnInit, AfterViewInit, OnDestroy, if (this.appearance.showLabel) { this.label$ = this.ctx ? this.ctx.registerLabelPattern(this.appearance.label, this.label$) : of(this.appearance.label); } + this.updateBorderRadius(); const appearanceCss = generateWidgetButtonAppearanceCss(this.appearance); this.appearanceCssClass = this.utils.applyCssToElement(this.renderer, this.elementRef.nativeElement, 'tb-widget-button', appearanceCss); this.updateAutoScale(); } + private updateBorderRadius(): void { + const validatedBorderRadius = validateCssSize(this.appearance.borderRadius); + if (validatedBorderRadius) { + this.computedBorderRadius = validatedBorderRadius; + } else { + this.computedBorderRadius = this.borderRadius; + } + } + private clearAppearanceCss(): void { if (this.appearanceCssClass) { this.utils.clearCssElement(this.renderer, this.appearanceCssClass, this.elementRef?.nativeElement); @@ -162,7 +182,8 @@ export class WidgetButtonComponent implements OnInit, AfterViewInit, OnDestroy, this.buttonResize$.disconnect(); } if (this.widgetButton && this.widgetButtonContent) { - if (this.appearance.autoScale) { + const autoScale = isDefinedAndNotNull(this.autoScale) ? this.autoScale : this.appearance.autoScale; + if (autoScale) { this.buttonResize$ = new ResizeObserver(() => { this.onResize(); }); diff --git a/ui-ngx/src/app/shared/components/button/widget-button.models.ts b/ui-ngx/src/app/shared/components/button/widget-button.models.ts index 34f13864a9..b81cd43f5d 100644 --- a/ui-ngx/src/app/shared/components/button/widget-button.models.ts +++ b/ui-ngx/src/app/shared/components/button/widget-button.models.ts @@ -98,6 +98,7 @@ export interface WidgetButtonAppearance { icon: string; iconSize: number; iconSizeUnit: cssUnit; + borderRadius?: string; mainColor: string; backgroundColor: string; customStyle: WidgetButtonCustomStyles; diff --git a/ui-ngx/src/app/shared/models/widget-settings.models.ts b/ui-ngx/src/app/shared/models/widget-settings.models.ts index 5bd9e26f13..8e60c0d9cb 100644 --- a/ui-ngx/src/app/shared/models/widget-settings.models.ts +++ b/ui-ngx/src/app/shared/models/widget-settings.models.ts @@ -21,7 +21,8 @@ import { Datasource, DatasourceData, DatasourceType, - TargetDevice, TargetDeviceType + TargetDevice, + TargetDeviceType } from '@shared/models/widget.models'; import { Injector } from '@angular/core'; import { DatePipe } from '@angular/common'; @@ -232,6 +233,15 @@ export const resolveCssSize = (strSize?: string): [number, cssUnit] => { return [numericSize, resolvedUnit]; }; +export const validateCssSize = (strSize?: string): string | undefined => { + const resolved = resolveCssSize(strSize); + if (!!resolved[0] && !!resolved[1]) { + return cssSizeToStrSize(resolved[0], resolved[1]); + } else { + return undefined; + } +}; + type ValueColorFunction = (value: any) => string; export abstract class ColorProcessor { diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index c71f33fca7..0bc4565bf5 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -5231,6 +5231,19 @@ "disabled-colors": "Disabled colors", "button": "Button" }, + "toggle-button": { + "behavior": "Behavior", + "checked": "Checked", + "unchecked": "Unchecked", + "check": "Check", + "check-hint": "Action performed to check the component.", + "uncheck": "Uncheck", + "uncheck-hint": "Action performed to uncheck the component.", + "auto-scale": "Auto scale", + "horizontal-fill": "Horizontal fill", + "vertical-fill": "Vertical fill", + "button-appearance": "Button appearance" + }, "button": { "layout": "Layout", "outlined": "Outlined", @@ -5240,6 +5253,7 @@ "auto-scale": "Auto scale", "label": "Label", "icon": "Icon", + "border-radius": "Border radius", "color-palette": "Color palette", "main": "Main", "background": "Background", diff --git a/ui-ngx/src/form.scss b/ui-ngx/src/form.scss index ab018a8bc6..524a4e86ac 100644 --- a/ui-ngx/src/form.scss +++ b/ui-ngx/src/form.scss @@ -651,7 +651,8 @@ &.mdc-evolution-chip--with-primary-graphic { .mdc-evolution-chip__action--primary { width: 100%; - padding-right: 0; + padding-left: 12px; + padding-right: 12px; gap: 0; .mdc-evolution-chip__graphic { padding: 0;