A lot of the final assembly may move to another country, but not the US. The components will still probably be made in China. The tariff game is complex. A lot depends on how the law was written. So it may be if it's direct shipped from China, you get hit with tariffs. But if it's shipped to Vietnam or Indonesia or wherever, and a sticker or final assembly is made there and then shipped to the US, it may clear tariffs.
I don't expect manufacturing to come back to the US. EPA rules and OSHA regulations mean it's cheaper to manufacture in foreign countries like China, Vietnam, etc where they simply do not have the environmental laws nor the workplace safety regulations. Cold, but it's the reality. Plus paying someone $5 a day in places like Vietnam vs the US still makes a big difference in the cost to WalMart and other big box retailers.
As for the new tariffs, I have a supplier of mine (not electronics) that has sent out emails saying to check prices daily when giving quotes. If they have the material in house already, then no tariffs. If it comes from China and isn't here yet, it may or may not have tariffs. They are going through each one of their SKU's and having to check every single product they sell against the latest published tariffs. Makes it tough to quote as you don't know if the price will be accurate or not. They sells 10,000's of products so there is a ton of labor involved with checking to see if they are being compliant. Someone has to pay for that and it isn't China.