Out of stock class on swatch when using multiple attributes

When a variation is out of stock, we need to show to customer by greying it out, but it still has to be clickable/selectable to be able to use waitlist feature. When the variable product only has one attribute (ex. size), the class iconic-was-swatches__item–out-of-stock is added to the one that is out of stock, but if we have both size and color attributes, the out of stock variations aren’t getting this class or any other indication they are out of stock. Can this be solved with some custom code snippet, or can this be added to a new plugin release?